Expand dEQP-VK.glsl.opaque_type_indexing shader types

This change expands dEQP-VK.glsl.opaque_type_indexing group to cover
geometry and tessellation shaders.

VK-GL-CTS issue: 357
Components: Vulkan

Change-Id: I3a89e3d2d59b826b078504cc6831254e839bb741

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index b1c2a0d..511a248 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -149007,6 +149007,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.sampler2darray
@@ -149052,6 +149097,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.sampler2darray
@@ -149097,6 +149187,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.sampler2darray
@@ -149142,6 +149277,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler2
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.sampler2darray
@@ -149159,33 +149339,63 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_compute
 dEQP-VK.renderpass.simple.color
 dEQP-VK.renderpass.simple.depth

diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
index 05ecfd1..933f65a 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
@@ -1968,9 +1968,12 @@ void OpaqueTypeIndexingTests::init (void)
                const char*             name;
        } shaderTypes[] =
        {
-               { glu::SHADERTYPE_VERTEX,               "vertex"        },
-               { glu::SHADERTYPE_FRAGMENT,             "fragment"      },
-               { glu::SHADERTYPE_COMPUTE,              "compute"       }
+               { glu::SHADERTYPE_VERTEX,                                       "vertex"        },
+               { glu::SHADERTYPE_FRAGMENT,                                     "fragment"      },
+               { glu::SHADERTYPE_GEOMETRY,                                     "geometry"      },
+               { glu::SHADERTYPE_TESSELLATION_CONTROL,         "tess_ctrl"     },
+               { glu::SHADERTYPE_TESSELLATION_EVALUATION,      "tess_eval"     },
+               { glu::SHADERTYPE_COMPUTE,                                      "compute"       }
        };
 
        // .sampler

diff --git a/external/vulkancts/mustpass/1.0.3/vk-default.txt b/external/vulkancts/mustpass/1.0.3/vk-default.txt
index ffb053a..793aa7b 100644 (file)
--- a/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt
@@ -171124,6 +171124,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_literal.compute.sampler2darray
@@ -171169,6 +171214,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.const_expression.compute.sampler2darray
@@ -171214,6 +171304,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.uniform.compute.sampler2darray
@@ -171259,6 +171394,51 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler2
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usamplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler2darray
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.fragment.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.geometry.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_ctrl.usampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.samplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2dshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.samplercubeshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.sampler2darrayshadow
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.isampler3d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler2d
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usamplercube
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler2darray
+dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.tess_eval.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.sampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.samplercube
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.sampler2darray
@@ -171276,33 +171456,63 @@ dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.usampler2d
 dEQP-VK.glsl.opaque_type_indexing.sampler.dynamically_uniform.compute.usampler3d
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ubo.dynamically_uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.ssbo.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_literal_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.const_expression_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.uniform_compute
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_vertex
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_fragment
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_geometry
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_tess_ctrl
+dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_tess_eval
 dEQP-VK.glsl.opaque_type_indexing.atomic_counter.dynamically_uniform_compute
 dEQP-VK.renderpass.simple.color
 dEQP-VK.renderpass.simple.depth