fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove _MESA_NEW_TRANSFER_STATE

Browse source
This commit is contained in:
Brian Paul 2011-03-23 09:04:22 -06:00
parent f6970872c0
commit 7ecb61c30c
4 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/main/mtypes.h
View file

@ -3025,8 +3025,6 @@ struct gl_matrix_stack
#define _MESA_NEW_NEED_NORMALS (_NEW_LIGHT | \
_NEW_TEXTURE)
#define _MESA_NEW_TRANSFER_STATE (_NEW_PIXEL)
/*@}*/

2
src/mesa/main/pixel.c
View file

@ -617,7 +617,7 @@ update_image_transfer_state(struct gl_context *ctx)
*/
void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )
{
if (new_state & _MESA_NEW_TRANSFER_STATE)
if (new_state & _NEW_PIXEL)
update_image_transfer_state(ctx);
}

2
src/mesa/main/state.c
View file

@ -602,7 +602,7 @@ _mesa_update_state_locked( struct gl_context *ctx )
if (new_state & (_NEW_STENCIL | _NEW_BUFFERS))
_mesa_update_stencil( ctx );
if (new_state & _MESA_NEW_TRANSFER_STATE)
if (new_state & _NEW_PIXEL)
_mesa_update_pixel( ctx, new_state );
if (new_state & _DD_NEW_SEPARATE_SPECULAR)

10
src/mesa/main/teximage.c
View file

@ -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,