diff --git a/.gitlab-ci/deqp-radv-fiji-aco-fails.txt b/.gitlab-ci/deqp-radv-fiji-aco-fails.txt
index 08aca7dd40c..96cb3f109e9 100644
--- a/.gitlab-ci/deqp-radv-fiji-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-fiji-aco-fails.txt
@@ -27,3 +27,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-navi10-aco-fails.txt b/.gitlab-ci/deqp-radv-navi10-aco-fails.txt
index 3c810f18c74..9ace48982b2 100644
--- a/.gitlab-ci/deqp-radv-navi10-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-navi10-aco-fails.txt
@@ -7,3 +7,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-navi14-aco-fails.txt b/.gitlab-ci/deqp-radv-navi14-aco-fails.txt
index 3c810f18c74..9ace48982b2 100644
--- a/.gitlab-ci/deqp-radv-navi14-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-navi14-aco-fails.txt
@@ -7,3 +7,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt b/.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt
index c874e0da0f1..12178b0a0d5 100644
--- a/.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-pitcairn-aco-fails.txt
@@ -9,3 +9,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-polaris10-aco-fails.txt b/.gitlab-ci/deqp-radv-polaris10-aco-fails.txt
index 3c810f18c74..9ace48982b2 100644
--- a/.gitlab-ci/deqp-radv-polaris10-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-polaris10-aco-fails.txt
@@ -7,3 +7,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-raven-aco-fails.txt b/.gitlab-ci/deqp-radv-raven-aco-fails.txt
index 3c810f18c74..9ace48982b2 100644
--- a/.gitlab-ci/deqp-radv-raven-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-raven-aco-fails.txt
@@ -7,3 +7,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop
diff --git a/.gitlab-ci/deqp-radv-vega10-aco-fails.txt b/.gitlab-ci/deqp-radv-vega10-aco-fails.txt
index 3c810f18c74..9ace48982b2 100644
--- a/.gitlab-ci/deqp-radv-vega10-aco-fails.txt
+++ b/.gitlab-ci/deqp-radv-vega10-aco-fails.txt
@@ -7,3 +7,15 @@ dEQP-VK.rasterization.interpolation.basic.non_strict_lines_wide
 dEQP-VK.rasterization.interpolation.projected.lines_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_line_strip_wide
 dEQP-VK.rasterization.interpolation.projected.non_strict_lines_wide
+
+# https://github.com/KhronosGroup/glslang/issues/2357
+dEQP-VK.descriptor_indexing.storage_buffer
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind
+dEQP-VK.descriptor_indexing.storage_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic
+dEQP-VK.descriptor_indexing.storage_buffer_dynamic_in_loop
+dEQP-VK.descriptor_indexing.storage_buffer_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_after_bind_in_loop
+dEQP-VK.descriptor_indexing.uniform_texel_buffer_in_loop