summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/tgsi
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2016-11-05 18:16:16 +0100
committerMarek Olšák <[email protected]>2016-11-08 17:56:42 +0100
commitf864547fa92262f4b2c65a047210ee41e5b45e9a (patch)
tree91f705439da977062f1df9c247bd005580568952 /src/gallium/auxiliary/tgsi
parent6b7cc8a9ecb37e712679419008fb661e832abf49 (diff)
tgsi/scan: fix images_buffers regression
The first IF statement disabled the second one. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98599 Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/tgsi')
-rw-r--r--src/gallium/auxiliary/tgsi/tgsi_scan.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index aeb326a8bfe..26cb2beaceb 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -472,6 +472,8 @@ scan_declaration(struct tgsi_shader_info *info,
info->const_buffers_declared |= 1u << buffer;
} else if (file == TGSI_FILE_IMAGE) {
info->images_declared |= 1u << reg;
+ if (fulldecl->Image.Resource == TGSI_TEXTURE_BUFFER)
+ info->images_buffers |= 1 << reg;
} else if (file == TGSI_FILE_BUFFER) {
info->shader_buffers_declared |= 1u << reg;
} else if (file == TGSI_FILE_INPUT) {
@@ -593,9 +595,6 @@ scan_declaration(struct tgsi_shader_info *info,
assert(info->sampler_targets[reg] == target);
assert(info->sampler_type[reg] == type);
}
- } else if (file == TGSI_FILE_IMAGE) {
- if (fulldecl->Image.Resource == TGSI_TEXTURE_BUFFER)
- info->images_buffers |= 1 << reg;
}
}
}