radeonsi: fix incorrect FMASK checking in bind_sampler_states
authorMarek Olšák <marek.olsak@amd.com>
Fri, 2 Dec 2016 01:57:30 +0000 (02:57 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Wed, 7 Dec 2016 17:46:54 +0000 (18:46 +0100)
Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeonsi/si_descriptors.c

index 8777f36edc6dabbb3cc70aa1b372dd233a1edd33..cf661022d28d1991cbcd513efdffc1c23deacb91 100644 (file)
@@ -808,10 +808,10 @@ static void si_bind_sampler_states(struct pipe_context *ctx,
                /* If FMASK is bound, don't overwrite it.
                 * The sampler state will be set after FMASK is unbound.
                 */
-               if (samplers->views.views[i] &&
-                   samplers->views.views[i]->texture &&
-                   samplers->views.views[i]->texture->target != PIPE_BUFFER &&
-                   ((struct r600_texture*)samplers->views.views[i]->texture)->fmask.size)
+               if (samplers->views.views[slot] &&
+                   samplers->views.views[slot]->texture &&
+                   samplers->views.views[slot]->texture->target != PIPE_BUFFER &&
+                   ((struct r600_texture*)samplers->views.views[slot]->texture)->fmask.size)
                        continue;
 
                memcpy(desc->list + slot * 16 + 12, sstates[i]->val, 4*4);