diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-24 07:37:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-24 07:37:29 +0000 |
| commit | b39f063f74bf0163eaf34db03134f226d18142ec (patch) | |
| tree | bf7f3736a65e74d20d63cc9f9938d9006dc2a1fe /mesalib/src/mesa/main/teximage.c | |
| parent | eca5dee9e7a8dea1edba4d10b60444ac0e884139 (diff) | |
| download | vcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.tar.gz vcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.tar.bz2 vcxsrv-b39f063f74bf0163eaf34db03134f226d18142ec.zip | |
xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 2a3037f61..c6b8c05b1 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -55,9 +55,7 @@ * In particular, we care about pixel transfer state and buffer state * (such as glReadBuffer to make sure we read from the right renderbuffer). */ -#define NEW_COPY_TEX_STATE (_MESA_NEW_TRANSFER_STATE | \ - _NEW_BUFFERS | \ - _NEW_PIXEL) +#define NEW_COPY_TEX_STATE (_NEW_BUFFERS | _NEW_PIXEL) @@ -2434,7 +2432,7 @@ teximage(struct gl_context *ctx, GLuint dims, return; /* error was recorded */ } - if (ctx->NewState & _MESA_NEW_TRANSFER_STATE) + if (ctx->NewState & _NEW_PIXEL) _mesa_update_state(ctx); texObj = _mesa_get_current_tex_object(ctx, target); @@ -2580,7 +2578,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) return; } - if (ctx->NewState & _MESA_NEW_TRANSFER_STATE) + if (ctx->NewState & _NEW_PIXEL) _mesa_update_state(ctx); texObj = _mesa_get_current_tex_object(ctx, target); @@ -2637,7 +2635,7 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level, return; } - if (ctx->NewState & _MESA_NEW_TRANSFER_STATE) + if (ctx->NewState & _NEW_PIXEL) _mesa_update_state(ctx); if (subtexture_error_check(ctx, dims, target, level, xoffset, yoffset, zoffset, |