Add feature requirements to existing amber files

Updates the amber files themselves to mirror the constraints enforced on the C++ side.

Components: Vulkan
Change-Id: I698a39732b02cb99fe1aeb369f1054ac9a769bfb
VK-GL-CTS: 1965

diff --git a/external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber b/external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber
index 3b64b81..6ad30e2 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber
+++ b/external/vulkancts/data/vulkan/amber/provoking_vertex/line_list_with_adjacency.amber
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+[require]
+geometryShader
 
 [vertex shader]
 #version 430

diff --git a/external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber b/external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber
index 19f5fa0..66940d1 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber
+++ b/external/vulkancts/data/vulkan/amber/provoking_vertex/line_strip_with_adjacency.amber
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+[require]
+geometryShader
 
 [vertex shader]
 #version 430

diff --git a/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber b/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber
index fa9fe7f..dde2c28 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber
+++ b/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_list_with_adjacency.amber
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+[require]
+geometryShader
 
 [vertex shader]
 #version 430

diff --git a/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber b/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber
index a8505a5..a19c0f6 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber
+++ b/external/vulkancts/data/vulkan/amber/provoking_vertex/triangle_strip_with_adjacency.amber
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+[require]
+geometryShader
 
 [vertex shader]
 #version 430

diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber
index 8e24657..3b0afc0 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber
+++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup.amber
@@ -21,6 +21,9 @@
 # Compiled with `clspv -no-inline-single -cl-opt-disable <X.clc>` with a (correct) ArrayStride decoration
 # added. This is allowed but not needed so provides a baseline for comparison.
 
+[require]
+VariablePointerFeatures.variablePointers
+
 [compute shader spirv]
                OpCapability Shader
                OpCapability VariablePointers

diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber
index 5a2cd69..1169333 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber
+++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_bad_stride.amber
@@ -20,6 +20,8 @@
 #
 # Compiled with `clspv -no-inline-single -cl-opt-disable <X.clc>` with an incorrect ArrayStride decoration
 # added. This decoration should be ignored, so it should give the same results as ArrayStride == 4.
+[require]
+VariablePointerFeatures.variablePointers
 
 [compute shader spirv]
                OpCapability Shader

diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber
index 712665f..b9d09a1 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber
+++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/compute/ptr_access_chain/workgroup_no_stride.amber
@@ -19,6 +19,8 @@
 #}
 #
 # Compiled with `clspv -no-inline-single -cl-opt-disable <X.clc>`
+[require]
+VariablePointerFeatures.variablePointers
 
 [compute shader spirv]
                OpCapability Shader