Group all OpName and OpMemberName together.

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 12da40b..82b9261 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -3977,7 +3977,6 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
 
                "OpExecutionMode %frag_main OriginUpperLeft\n"
 
-               "; Vertex decorations\n"
                "OpName %vert_main \"main\"\n"
                "OpName %vert_vtxPosition \"vtxPosition\"\n"
                "OpName %vert_Position \"position\"\n"
@@ -3985,14 +3984,6 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
                "OpName %vert_color \"color\"\n"
                "OpName %vert_vertex_id \"gl_VertexIndex\"\n"
                "OpName %vert_instance_id \"gl_InstanceIndex\"\n"
-               "OpDecorate %vert_vtxPosition Location 2\n"
-               "OpDecorate %vert_Position Location 0\n"
-               "OpDecorate %vert_vtxColor Location 1\n"
-               "OpDecorate %vert_color Location 1\n"
-               "OpDecorate %vert_vertex_id BuiltIn VertexIndex\n"
-               "OpDecorate %vert_instance_id BuiltIn InstanceIndex\n"
-
-               "; Geometry decorations\n"
                "OpName %geom_main \"main\"\n"
                "OpName %geom_per_vertex_in \"gl_PerVertex\"\n"
                "OpMemberName %geom_per_vertex_in 0 \"gl_Position\"\n"
@@ -4002,6 +3993,38 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
                "OpName %geom_gl_in \"gl_in\"\n"
                "OpName %geom_out_color \"out_color\"\n"
                "OpName %geom_in_color \"in_color\"\n"
+               "OpName %tessc_main \"main\"\n"
+               "OpName %tessc_out_color \"out_color\"\n"
+               "OpName %tessc_gl_InvocationID \"gl_InvocationID\"\n"
+               "OpName %tessc_in_color \"in_color\"\n"
+               "OpName %tessc_out_position \"out_position\"\n"
+               "OpName %tessc_in_position \"in_position\"\n"
+               "OpName %tessc_gl_TessLevelOuter \"gl_TessLevelOuter\"\n"
+               "OpName %tessc_gl_TessLevelInner \"gl_TessLevelInner\"\n"
+               "OpName %tesse_main \"main\"\n"
+               "OpName %tesse_per_vertex_out \"gl_PerVertex\"\n"
+               "OpMemberName %tesse_per_vertex_out 0 \"gl_Position\"\n"
+               "OpMemberName %tesse_per_vertex_out 1 \"gl_PointSize\"\n"
+               "OpMemberName %tesse_per_vertex_out 2 \"gl_ClipDistance\"\n"
+               "OpMemberName %tesse_per_vertex_out 3 \"gl_CullDistance\"\n"
+               "OpName %tesse_stream \"\"\n"
+               "OpName %tesse_gl_tessCoord \"gl_TessCoord\"\n"
+               "OpName %tesse_in_position \"in_position\"\n"
+               "OpName %tesse_out_color \"out_color\"\n"
+               "OpName %tesse_in_color \"in_color\"\n"
+               "OpName %frag_main \"main\"\n"
+               "OpName %frag_fragColor \"fragColor\"\n"
+               "OpName %frag_vtxColor \"vtxColor\"\n"
+
+               "; Vertex decorations\n"
+               "OpDecorate %vert_vtxPosition Location 2\n"
+               "OpDecorate %vert_Position Location 0\n"
+               "OpDecorate %vert_vtxColor Location 1\n"
+               "OpDecorate %vert_color Location 1\n"
+               "OpDecorate %vert_vertex_id BuiltIn VertexIndex\n"
+               "OpDecorate %vert_instance_id BuiltIn InstanceIndex\n"
+
+               "; Geometry decorations\n"
                "OpDecorate %geom_out_gl_position BuiltIn Position\n"
                "OpMemberDecorate %geom_per_vertex_in 0 BuiltIn Position\n"
                "OpMemberDecorate %geom_per_vertex_in 1 BuiltIn PointSize\n"
@@ -4013,14 +4036,6 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
                "OpDecorate %geom_in_color Location 1\n"
 
                "; Tessellation Control decorations\n"
-               "OpName %tessc_main \"main\"\n"
-               "OpName %tessc_out_color \"out_color\"\n"
-               "OpName %tessc_gl_InvocationID \"gl_InvocationID\"\n"
-               "OpName %tessc_in_color \"in_color\"\n"
-               "OpName %tessc_out_position \"out_position\"\n"
-               "OpName %tessc_in_position \"in_position\"\n"
-               "OpName %tessc_gl_TessLevelOuter \"gl_TessLevelOuter\"\n"
-               "OpName %tessc_gl_TessLevelInner \"gl_TessLevelInner\"\n"
                "OpDecorate %tessc_out_color Location 1\n"
                "OpDecorate %tessc_gl_InvocationID BuiltIn InvocationId\n"
                "OpDecorate %tessc_in_color Location 1\n"
@@ -4032,17 +4047,6 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
                "OpDecorate %tessc_gl_TessLevelInner BuiltIn TessLevelInner\n"
 
                "; Tessellation Evaluation decorations\n"
-               "OpName %tesse_main \"main\"\n"
-               "OpName %tesse_per_vertex_out \"gl_PerVertex\"\n"
-               "OpMemberName %tesse_per_vertex_out 0 \"gl_Position\"\n"
-               "OpMemberName %tesse_per_vertex_out 1 \"gl_PointSize\"\n"
-               "OpMemberName %tesse_per_vertex_out 2 \"gl_ClipDistance\"\n"
-               "OpMemberName %tesse_per_vertex_out 3 \"gl_CullDistance\"\n"
-               "OpName %tesse_stream \"\"\n"
-               "OpName %tesse_gl_tessCoord \"gl_TessCoord\"\n"
-               "OpName %tesse_in_position \"in_position\"\n"
-               "OpName %tesse_out_color \"out_color\"\n"
-               "OpName %tesse_in_color \"in_color\"\n"
                "OpMemberDecorate %tesse_per_vertex_out 0 BuiltIn Position\n"
                "OpMemberDecorate %tesse_per_vertex_out 1 BuiltIn PointSize\n"
                "OpMemberDecorate %tesse_per_vertex_out 2 BuiltIn ClipDistance\n"
@@ -4054,9 +4058,6 @@ void createCombinedModule(vk::SourceCollections& dst, InstanceContext)
                "OpDecorate %tesse_in_color Location 1\n"
 
                "; Fragment decorations\n"
-               "OpName %frag_main \"main\"\n"
-               "OpName %frag_fragColor \"fragColor\"\n"
-               "OpName %frag_vtxColor \"vtxColor\"\n"
                "OpDecorate %frag_fragColor Location 0\n"
                "OpDecorate %frag_vtxColor Location 1\n"