Module: Mesa
Branch: master
Commit: 222d862cd332dba3c2bd8b28270c3a0d0aed6ec6
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=222d862cd332dba3c2bd8b28270c3a0d0aed6ec6
Author: Timothy Arceri <tarc...@itsqueeze.com>
Date: Wed Mar 28 12:31:01 2018 +1100
radeonsi/nir: don't add bindless samplers/images to declared bitmasks
Reviewed-by: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/drivers/radeonsi/si_shader_nir.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c
b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 47f9ef2945..80c436247c 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -657,22 +657,22 @@ void si_nir_scan_shader(const struct nir_shader *nir,
* eliminated struct dereferences.
*/
if (base_type == GLSL_TYPE_SAMPLER) {
- info->samplers_declared |=
- u_bit_consecutive(variable->data.binding,
aoa_size);
-
if (variable->data.bindless) {
info->const_buffers_declared |= 1;
info->const_file_max[0] +=
glsl_count_attribute_slots(type, false);
+ } else {
+ info->samplers_declared |=
+
u_bit_consecutive(variable->data.binding, aoa_size);
}
} else if (base_type == GLSL_TYPE_IMAGE) {
- info->images_declared |=
- u_bit_consecutive(variable->data.binding,
aoa_size);
-
if (variable->data.bindless) {
info->const_buffers_declared |= 1;
info->const_file_max[0] +=
glsl_count_attribute_slots(type, false);
+ } else {
+ info->images_declared |=
+
u_bit_consecutive(variable->data.binding, aoa_size);
}
} else if (base_type != GLSL_TYPE_ATOMIC_UINT) {
if (strncmp(variable->name, "state.", 6) == 0 ||
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
