Fix SPIRV validation for decoration tests

The decoration matching tests were incorrectly using Flat and
NoPerspective decoration on vertex inputs. The validator has been
updated to catch these errors, so the tests now cause an InternalError.

Compoennts: Vulkan
VK-GL-CTS issue: 3895
Affects: dEQP-VK.spirv_assembly.instruction.graphics.cross_stage.basic_type.flat
         dEQP-VK.spirv_assembly.instruction.graphics.cross_stage.basic_type.no_perspective
         dEQP-VK.spirv_assembly.instruction.graphics.cross_stage.interface_blocks.flat
         dEQP-VK.spirv_assembly.instruction.graphics.cross_stage.interface_blocks.no_perspective

Change-Id: I818868ca87d15d068430e9721204be620b28e225

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
index 767806b..b3c6463 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmCrossStageInterfaceTests.cpp
@@ -664,7 +664,6 @@ void CrossStageBasicTestsCase::initPrograms (SourceCollections& programCollectio
                decorations.push_back(Decorations("",
                                                                //Vertex
                                                                "OpDecorate %color_out Flat\n"
-                                                               "OpDecorate %color_in Flat\n"
                                                                "OpDecorate %r_float_out Flat\n"
                                                                "OpDecorate %rg_float_out Flat\n"
                                                                "OpDecorate %rgb_float_out Flat\n"
@@ -687,7 +686,6 @@ void CrossStageBasicTestsCase::initPrograms (SourceCollections& programCollectio
                                                                "OpDecorate %rgba_float_in Flat\n",
                                                                //Vertex
                                                                "OpDecorate %color_out Flat\n"
-                                                               "OpDecorate %color_in Flat\n"
                                                                "OpDecorate %r_float_out Flat\n"
                                                                "OpDecorate %rg_float_out Flat\n"
                                                                "OpDecorate %rgb_float_out Flat\n"
@@ -699,7 +697,6 @@ void CrossStageBasicTestsCase::initPrograms (SourceCollections& programCollectio
                decorations.push_back(Decorations("",
                                                                //Vertex
                                                                "OpDecorate %color_out NoPerspective\n"
-                                                               "OpDecorate %color_in NoPerspective\n"
                                                                "OpDecorate %r_float_out NoPerspective\n"
                                                                "OpDecorate %rg_float_out NoPerspective\n"
                                                                "OpDecorate %rgb_float_out NoPerspective\n"
@@ -723,7 +720,6 @@ void CrossStageBasicTestsCase::initPrograms (SourceCollections& programCollectio
                                                                "OpDecorate %rgba_float_in NoPerspective\n",
                                                                //Vertex
                                                                "OpDecorate %color_out NoPerspective\n"
-                                                               "OpDecorate %color_in NoPerspective\n"
                                                                "OpDecorate %r_float_out NoPerspective\n"
                                                                "OpDecorate %rg_float_out NoPerspective\n"
                                                                "OpDecorate %rgb_float_out NoPerspective\n"
@@ -1787,7 +1783,6 @@ void CrossStageInterfaceTestsCase::initPrograms (SourceCollections& programColle
                decorations.push_back(Decorations("",
                                                                //Vertex
                                                                "OpDecorate %color_out Flat\n"
-                                                               "OpDecorate %color_in Flat\n"
                                                                "OpMemberDecorate %block_out 0 Flat\n"
                                                                "OpMemberDecorate %block_out 1 Flat\n",
                                                                ""));
@@ -1804,7 +1799,6 @@ void CrossStageInterfaceTestsCase::initPrograms (SourceCollections& programColle
                                                                "OpMemberDecorate %block_in 1 Flat\n",
                                                                //Vertex
                                                                "OpDecorate %color_out Flat\n"
-                                                               "OpDecorate %color_in Flat\n"
                                                                "OpMemberDecorate %block_out 0 Flat\n"
                                                                "OpMemberDecorate %block_out 1 Flat\n",
                                                                ""));
@@ -1814,7 +1808,6 @@ void CrossStageInterfaceTestsCase::initPrograms (SourceCollections& programColle
                decorations.push_back(Decorations("",
                                                                //Vertex
                                                                "OpDecorate %color_out NoPerspective\n"
-                                                               "OpDecorate %color_in NoPerspective\n"
                                                                "OpMemberDecorate %block_out 0 NoPerspective\n"
                                                                "OpMemberDecorate %block_out 1 NoPerspective\n",
                                                                ""));
@@ -1832,7 +1825,6 @@ void CrossStageInterfaceTestsCase::initPrograms (SourceCollections& programColle
                                                                "OpMemberDecorate %block_in 1 NoPerspective\n",
                                                                //Vertex
                                                                "OpDecorate %color_out NoPerspective\n"
-                                                               "OpDecorate %color_in NoPerspective\n"
                                                                "OpMemberDecorate %block_out 0 NoPerspective\n"
                                                                "OpMemberDecorate %block_out 1 NoPerspective\n",
                                                                ""));