aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker/st_texture.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-19 11:17:56 +0200
committermarha <marha@users.sourceforge.net>2014-10-19 11:17:56 +0200
commitfa5a6df66cfe9b19014ea9d2fca35b762f457041 (patch)
tree1925fdd9f855e3b32622d09280ecf7cda252f619 /mesalib/src/mesa/state_tracker/st_texture.c
parent9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff)
downloadvcxsrv-fa5a6df66cfe9b19014ea9d2fca35b762f457041.tar.gz
vcxsrv-fa5a6df66cfe9b19014ea9d2fca35b762f457041.tar.bz2
vcxsrv-fa5a6df66cfe9b19014ea9d2fca35b762f457041.zip
mesa git update 19 oct 2014
mesa commit 6212d2402df4ad0658cbb98ce889e35ef5f32fa3
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_texture.c')
-rw-r--r--mesalib/src/mesa/state_tracker/st_texture.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c
index 5996b7d1b..ada984189 100644
--- a/mesalib/src/mesa/state_tracker/st_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_texture.c
@@ -519,12 +519,14 @@ st_texture_release_sampler_view(struct st_context *st,
}
void
-st_texture_release_all_sampler_views(struct st_texture_object *stObj)
+st_texture_release_all_sampler_views(struct st_context *st,
+ struct st_texture_object *stObj)
{
GLuint i;
+ /* XXX This should use sampler_views[i]->pipe, not st->pipe */
for (i = 0; i < stObj->num_sampler_views; ++i)
- pipe_sampler_view_reference(&stObj->sampler_views[i], NULL);
+ pipe_sampler_view_release(st->pipe, &stObj->sampler_views[i]);
}