diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-17 08:04:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-17 08:04:15 +0200 |
| commit | ded57b5a4131a213d57f5a20d50b819b7a8924df (patch) | |
| tree | 5be4cc93cf5d77df72f8ae6e34953e026bde071f /mesalib/src/mesa/main/drawpix.c | |
| parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
| download | vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.gz vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.bz2 vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.zip | |
pixman mesa git update 17 oct 2012
pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956
mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
Diffstat (limited to 'mesalib/src/mesa/main/drawpix.c')
| -rw-r--r-- | mesalib/src/mesa/main/drawpix.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c index b5ab2cbeb..8836e0a0e 100644 --- a/mesalib/src/mesa/main/drawpix.c +++ b/mesalib/src/mesa/main/drawpix.c @@ -344,7 +344,6 @@ _mesa_Bitmap( GLsizei width, GLsizei height, ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap ); } } -#if _HAVE_FULL_GL else if (ctx->RenderMode == GL_FEEDBACK) { FLUSH_CURRENT(ctx, 0); _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_BITMAP_TOKEN ); @@ -357,7 +356,6 @@ _mesa_Bitmap( GLsizei width, GLsizei height, ASSERT(ctx->RenderMode == GL_SELECT); /* Do nothing. See OpenGL Spec, Appendix B, Corollary 6. */ } -#endif /* update raster position */ ctx->Current.RasterPos[0] += xmove; |