diff options
Diffstat (limited to 'src/mesa/main/pixel.c')
| -rw-r--r-- | src/mesa/main/pixel.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index a5cb6d85ef5..ffa362f297d 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -51,7 +51,7 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor ) ctx->Pixel.ZoomY == yfactor) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.ZoomX = xfactor; ctx->Pixel.ZoomY = yfactor; } @@ -191,7 +191,7 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values ) } } - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, 0); if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize, GL_INTENSITY, GL_FLOAT, INT_MAX, values)) { @@ -232,7 +232,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values ) } } - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, 0); if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize, GL_INTENSITY, GL_UNSIGNED_INT, INT_MAX, values)) { @@ -287,7 +287,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values ) } } - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, 0); if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize, GL_INTENSITY, GL_UNSIGNED_SHORT, INT_MAX, values)) { @@ -497,85 +497,85 @@ _mesa_PixelTransferf( GLenum pname, GLfloat param ) case GL_MAP_COLOR: if (ctx->Pixel.MapColorFlag == (param ? GL_TRUE : GL_FALSE)) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.MapColorFlag = param ? GL_TRUE : GL_FALSE; break; case GL_MAP_STENCIL: if (ctx->Pixel.MapStencilFlag == (param ? GL_TRUE : GL_FALSE)) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.MapStencilFlag = param ? GL_TRUE : GL_FALSE; break; case GL_INDEX_SHIFT: if (ctx->Pixel.IndexShift == (GLint) param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.IndexShift = (GLint) param; break; case GL_INDEX_OFFSET: if (ctx->Pixel.IndexOffset == (GLint) param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.IndexOffset = (GLint) param; break; case GL_RED_SCALE: if (ctx->Pixel.RedScale == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.RedScale = param; break; case GL_RED_BIAS: if (ctx->Pixel.RedBias == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.RedBias = param; break; case GL_GREEN_SCALE: if (ctx->Pixel.GreenScale == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.GreenScale = param; break; case GL_GREEN_BIAS: if (ctx->Pixel.GreenBias == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.GreenBias = param; break; case GL_BLUE_SCALE: if (ctx->Pixel.BlueScale == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.BlueScale = param; break; case GL_BLUE_BIAS: if (ctx->Pixel.BlueBias == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.BlueBias = param; break; case GL_ALPHA_SCALE: if (ctx->Pixel.AlphaScale == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.AlphaScale = param; break; case GL_ALPHA_BIAS: if (ctx->Pixel.AlphaBias == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.AlphaBias = param; break; case GL_DEPTH_SCALE: if (ctx->Pixel.DepthScale == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.DepthScale = param; break; case GL_DEPTH_BIAS: if (ctx->Pixel.DepthBias == param) return; - FLUSH_VERTICES(ctx, _NEW_PIXEL); + FLUSH_VERTICES(ctx, _NEW_PIXEL, GL_PIXEL_MODE_BIT); ctx->Pixel.DepthBias = param; break; default: |