diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-19 11:18:56 +0200 |
| commit | 9fc852414dd4e841c4e2229f55a3e41abca64ac5 (patch) | |
| tree | a524a96442c2a28243826f91f43680f4bcf012d3 /mesalib/src/mesa/state_tracker/st_texture.c | |
| parent | 8d44af7cf8bdc4f42223dfef737ebf4e8c7fe55e (diff) | |
| parent | fa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff) | |
| download | vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.gz vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.tar.bz2 vcxsrv-9fc852414dd4e841c4e2229f55a3e41abca64ac5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/bufferobj.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_texture.c | 6 |
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]); } |