diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-07-09 20:35:21 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-07-09 20:35:21 +0000 |
| commit | d6d2a2060930919a1a41a7d7d8dfc9836c78445c (patch) | |
| tree | be7d363e1b5d7febf7a5f9b1df9eb11cbc95158b /dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c | |
| parent | eae82d8d4094e92f24532177a3772d56fc98970d (diff) | |
Import Mesa 10.2.3
Diffstat (limited to 'dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c')
| -rw-r--r-- | dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c b/dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c index c140d6e73..d0bc7ff1a 100644 --- a/dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/dist/Mesa/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -585,12 +585,9 @@ nv50_stage_sampler_states_bind(struct nv50_context *nv50, int s, nv50_screen_tsc_unlock(nv50->screen, old); } assert(nv50->num_samplers[s] <= PIPE_MAX_SAMPLERS); - for (; i < nv50->num_samplers[s]; ++i) { - if (nv50->samplers[s][i]) { + for (; i < nv50->num_samplers[s]; ++i) + if (nv50->samplers[s][i]) nv50_screen_tsc_unlock(nv50->screen, nv50->samplers[s][i]); - nv50->samplers[s][i] = NULL; - } - } nv50->num_samplers[s] = nr; |