diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-01 04:28:32 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-01 04:28:32 +0000 |
| commit | c5a76cbed41b5816d2f5284f90c70364b062aea4 (patch) | |
| tree | 85d76cf432f7e33d419766afe54f144e20e0e0e6 /src/mesa/drivers/x11/xm_span.c | |
| parent | 09a0cb464d2bc661859c6435f2145e8a5ece005a (diff) | |
silence gcc warnings (Marc La France)
Diffstat (limited to 'src/mesa/drivers/x11/xm_span.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_span.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c index c9c1bdeb84..cbb138a0b3 100644 --- a/src/mesa/drivers/x11/xm_span.c +++ b/src/mesa/drivers/x11/xm_span.c @@ -1,4 +1,4 @@ -/* $Id: xm_span.c,v 1.13 2001/05/10 15:42:43 keithw Exp $ */ +/* $Id: xm_span.c,v 1.14 2002/03/01 04:28:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -23,7 +23,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - +/* $XFree86: xc/extras/Mesa/src/X/xm_span.c,v 1.3 2002/02/27 21:07:54 tsi Exp $ */ #include "glxheader.h" #include "context.h" @@ -186,6 +186,9 @@ static void write_span_TRUECOLOR_pixmap( RGBA_SPAN_ARGS ) XMesaDrawable buffer = xmesa->xm_buffer->buffer; XMesaGC gc = xmesa->xm_buffer->gc; register GLuint i; + + (void)DitherValues; /* Muffle compiler */ + y = FLIP(xmesa->xm_buffer, y); if (mask) { for (i=0;i<n;i++,x++) { @@ -3741,9 +3744,9 @@ static void read_color_span( const GLcontext *ctx, const GLubyte *pixelToG = xmesa->xm_visual->PixelToG; const GLubyte *pixelToB = xmesa->xm_visual->PixelToB; const GLushort *ptr2 = PIXELADDR2( source, x, y ); - const GLuint *ptr4 = (const GLuint *) ptr2; GLuint i; #if defined(__i386__) /* word stores don't have to be on 4-byte boundaries */ + const GLuint *ptr4 = (const GLuint *) ptr2; GLuint extraPixel = (n & 1); n -= extraPixel; for (i = 0; i < n; i += 2) { |