summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Arceri <tarceri@itsqueeze.com>2018-03-28 12:31:01 +1100
committerTimothy Arceri <tarceri@itsqueeze.com>2018-04-10 14:43:45 +1000
commit222d862cd332dba3c2bd8b28270c3a0d0aed6ec6 (patch)
tree5dcc217f63970c513063bfaab72a338ec0aafd97 /src
parentf33d9036b9145e3ff015e14537398d79c40fcf3f (diff)
radeonsi/nir: don't add bindless samplers/images to declared bitmasks
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/radeonsi/si_shader_nir.c12
1 files 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 47f9ef29454..80c436247c8 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 ||