diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 6 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_gen_mipmap.c | 3 |
4 files changed, 7 insertions, 13 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index 2575adda8fc..217116e0a0d 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -62,7 +62,7 @@ update_textures(struct st_context *st) if (samplersUsed & (1 << su)) { struct gl_texture_object *texObj; struct st_texture_object *stObj; - GLboolean flush, retval; + GLboolean retval; GLuint texUnit; if (fprog->Base.SamplersUsed & (1 << su)) @@ -77,7 +77,7 @@ update_textures(struct st_context *st) } stObj = st_texture_object(texObj); - retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush); + retval = st_finalize_texture(st->ctx, st->pipe, texObj); if (!retval) { /* out of mem */ continue; @@ -140,9 +140,9 @@ finalize_textures(struct st_context *st) = st->ctx->Texture.Unit[texUnit]._Current; if (texObj) { - GLboolean flush, retval; + GLboolean retval; - retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush); + retval = st_finalize_texture(st->ctx, st->pipe, texObj); if (!retval) { /* out of mem */ st->missing_textures = GL_TRUE; diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 5021dcbcb60..ed8eb2929a6 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -1812,8 +1812,7 @@ copy_image_data_to_texture(struct st_context *st, GLboolean st_finalize_texture(GLcontext *ctx, struct pipe_context *pipe, - struct gl_texture_object *tObj, - GLboolean *needFlush) + struct gl_texture_object *tObj) { struct st_context *st = st_context(ctx); struct st_texture_object *stObj = st_texture_object(tObj); @@ -1822,8 +1821,6 @@ st_finalize_texture(GLcontext *ctx, struct st_texture_image *firstImage; enum pipe_format firstImageFormat; - *needFlush = GL_FALSE; - if (stObj->base._Complete) { /* The texture is complete and we know exactly how many mipmap levels * are present/needed. This is conditional because we may be called @@ -1908,7 +1905,6 @@ st_finalize_texture(GLcontext *ctx, */ if (stImage && stObj->pt != stImage->pt) { copy_image_data_to_texture(st, stObj, level, stImage); - *needFlush = GL_TRUE; } } } diff --git a/src/mesa/state_tracker/st_cb_texture.h b/src/mesa/state_tracker/st_cb_texture.h index f1fe0339cdd..1cd9fc3a50f 100644 --- a/src/mesa/state_tracker/st_cb_texture.h +++ b/src/mesa/state_tracker/st_cb_texture.h @@ -33,8 +33,7 @@ extern GLboolean st_finalize_texture(GLcontext *ctx, struct pipe_context *pipe, - struct gl_texture_object *tObj, - GLboolean *needFlush); + struct gl_texture_object *tObj); extern struct gl_texture_object * diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index a015c4bb587..6b1d51b3f44 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -311,7 +311,6 @@ st_generate_mipmap(GLcontext *ctx, GLenum target, * mipmap levels we need to generate. So allocate a new texture. */ struct pipe_resource *oldTex = stObj->pt; - GLboolean needFlush; /* create new texture with space for more levels */ stObj->pt = st_texture_create(st, @@ -331,7 +330,7 @@ st_generate_mipmap(GLcontext *ctx, GLenum target, /* This will copy the old texture's base image into the new texture * which we just allocated. */ - st_finalize_texture(ctx, st->pipe, texObj, &needFlush); + st_finalize_texture(ctx, st->pipe, texObj); /* release the old tex (will likely be freed too) */ pipe_resource_reference(&oldTex, NULL); |