diff options
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/teximage.c | 6 | ||||
-rw-r--r-- | src/mesa/main/texobj.c | 9 | ||||
-rw-r--r-- | src/mesa/main/texobj.h | 3 | ||||
-rw-r--r-- | src/mesa/main/texparam.c | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index c1261138da1..e6cae0034c5 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3179,7 +3179,7 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, _mesa_update_fbo_texture(ctx, texObj, face, level); - _mesa_dirty_texobj(ctx, texObj, GL_TRUE); + _mesa_dirty_texobj(ctx, texObj); } } _mesa_unlock_texture(ctx, texObj); @@ -3298,7 +3298,7 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) ctx->Driver.EGLImageTargetTexture2D(ctx, target, texObj, texImage, image); - _mesa_dirty_texobj(ctx, texObj, GL_TRUE); + _mesa_dirty_texobj(ctx, texObj); } _mesa_unlock_texture(ctx, texObj); @@ -3569,7 +3569,7 @@ copyteximage(struct gl_context *ctx, GLuint dims, _mesa_update_fbo_texture(ctx, texObj, face, level); - _mesa_dirty_texobj(ctx, texObj, GL_TRUE); + _mesa_dirty_texobj(ctx, texObj); } } _mesa_unlock_texture(ctx, texObj); diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index cc2c786bb24..abd30c56320 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -715,20 +715,17 @@ _mesa_cube_complete(const struct gl_texture_object *texObj) /** * Mark a texture object dirty. It forces the object to be incomplete - * and optionally forces the context to re-validate its state. + * and forces the context to re-validate its state. * * \param ctx GL context. * \param texObj texture object. - * \param invalidate_state also invalidate context state. */ void -_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj, - GLboolean invalidate_state) +_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj) { texObj->_BaseComplete = GL_FALSE; texObj->_MipmapComplete = GL_FALSE; - if (invalidate_state) - ctx->NewState |= _NEW_TEXTURE; + ctx->NewState |= _NEW_TEXTURE; } diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 0df088ce424..55091a642b5 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -126,8 +126,7 @@ extern GLboolean _mesa_cube_complete(const struct gl_texture_object *texObj); extern void -_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj, - GLboolean invalidate_state); +_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj); extern struct gl_texture_object * _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex); diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 757ae80ec8d..31723c37784 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -256,7 +256,7 @@ static inline void incomplete(struct gl_context *ctx, struct gl_texture_object *texObj) { FLUSH_VERTICES(ctx, _NEW_TEXTURE); - _mesa_dirty_texobj(ctx, texObj, GL_TRUE); + _mesa_dirty_texobj(ctx, texObj); } |