summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2015-02-01 13:16:06 +0100
committerMarek Olšák <[email protected]>2015-02-04 14:34:13 +0100
commit82f64a68a4a621252111ff62fce4e85e14cdc822 (patch)
tree8c9d344bece93d5c4dba1a25c1e0b5a12a78be5c /src/gallium/drivers
parentb142dd2f2474af6479016d5fb5e87b0da015115c (diff)
radeonsi: fix a crash when binding a NULL sampler view list
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/radeonsi/si_descriptors.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 15b4da1e8c1..372782f49d9 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -404,7 +404,7 @@ static void si_set_sampler_views(struct pipe_context *ctx,
for (i = 0; i < count; i++) {
unsigned slot = start + i;
- if (!views[i]) {
+ if (!views || !views[i]) {
samplers->depth_texture_mask &= ~(1 << slot);
samplers->compressed_colortex_mask &= ~(1 << slot);
si_set_sampler_view(sctx, shader, slot, NULL, NULL);