diff options
| author | Michal Krol <[email protected]> | 2010-03-16 19:39:09 +0100 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2010-03-16 19:40:15 +0100 |
| commit | 40c3861e1e98116c573027b054a6a05208c53b6a (patch) | |
| tree | 1f529a56d664a7489ad0993f6073e7082cddd136 | |
| parent | ac8662c29dbf96b456d23308c1bc459eea63e36c (diff) | |
st/mesa: Invalidate sampler view when texture object changes.
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_gen_mipmap.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 6ed1c60a51e..3ef030f5a9b 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -571,6 +571,7 @@ st_TexImage(GLcontext * ctx, DBG("release it\n"); pipe_texture_reference(&stObj->pt, NULL); assert(!stObj->pt); + pipe_sampler_view_reference(&stObj->sampler_view, NULL); stObj->teximage_realloc = FALSE; } } @@ -1807,6 +1808,7 @@ st_finalize_texture(GLcontext *ctx, firstImage->pt != stObj->pt && firstImage->pt->last_level >= stObj->lastLevel) { pipe_texture_reference(&stObj->pt, firstImage->pt); + pipe_sampler_view_reference(&stObj->sampler_view, NULL); } /* bytes per pixel block (blocks are usually 1x1) */ @@ -1826,6 +1828,7 @@ st_finalize_texture(GLcontext *ctx, stObj->pt->depth0 != firstImage->base.Depth2) { pipe_texture_reference(&stObj->pt, NULL); + pipe_sampler_view_reference(&stObj->sampler_view, NULL); ctx->st->dirty.st |= ST_NEW_FRAMEBUFFER; } } diff --git a/src/mesa/state_tracker/st_gen_mipmap.c b/src/mesa/state_tracker/st_gen_mipmap.c index 97f6903f9e2..030b0a0f065 100644 --- a/src/mesa/state_tracker/st_gen_mipmap.c +++ b/src/mesa/state_tracker/st_gen_mipmap.c @@ -256,6 +256,7 @@ st_generate_mipmap(GLcontext *ctx, GLenum target, /* release the old tex (will likely be freed too) */ pipe_texture_reference(&oldTex, NULL); + pipe_sampler_view_reference(&stObj->sampler_view, NULL); pt = stObj->pt; } |