Tidy up extension headers in ballot_broadcast tests

This was included in the original version of CL4557 but seems to have
been lost in the merge with subgroup extended types.

Components: Vulkan
Affects: dEQP-VK.subgroups.ballot_broadcast.*

Change-Id: I932cede6ace01a38f8a70f754fb7b759e3c68881

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index 88814be..1440d16 100755 (executable)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
@@ -186,7 +186,8 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
        const string extensionHeader =  (caseDef.extShaderSubGroupBallotTests ? "#extension GL_ARB_shader_ballot: enable\n"
                                                                                                                                                        "#extension GL_KHR_shader_subgroup_basic: enable\n"
                                                                                                                                                        "#extension GL_ARB_gpu_shader_int64: enable\n"
-                                                                                                                                               :       "#extension GL_KHR_shader_subgroup_ballot: enable\n");
+                                                                                                                                               :       "#extension GL_KHR_shader_subgroup_ballot: enable\n")
+                                                                       + subgroups::getAdditionalExtensionForFormat(caseDef.format);
 
        subgroups::setFragmentShaderFrameBuffer(programCollection);
 
@@ -201,7 +202,6 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                std::ostringstream                              vertex;
                vertex << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << extensionHeader.c_str()
-                       << subgroups::getAdditionalExtensionForFormat(caseDef.format)
                        << "layout(location = 0) in highp vec4 in_position;\n"
                        << "layout(location = 0) out float out_color;\n"
                        << "layout(set = 0, binding = 0) uniform  Buffer1\n"
@@ -226,7 +226,6 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
 
                geometry << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << extensionHeader.c_str()
-                       << subgroups::getAdditionalExtensionForFormat(caseDef.format)
                        << "layout(points) in;\n"
                        << "layout(points, max_vertices = 1) out;\n"
                        << "layout(location = 0) out float out_color;\n"
@@ -255,7 +254,6 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
 
                controlSource << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << extensionHeader.c_str()
-                       << subgroups::getAdditionalExtensionForFormat(caseDef.format)
                        << "layout(vertices = 2) out;\n"
                        << "layout(location = 0) out float out_color[];\n"
                        << "layout(set = 0, binding = 0) uniform Buffer2\n"
@@ -285,7 +283,6 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                std::ostringstream evaluationSource;
                evaluationSource << glu::getGLSLVersionDeclaration(glu::GLSL_VERSION_450)<<"\n"
                        << extensionHeader.c_str()
-                       << subgroups::getAdditionalExtensionForFormat(caseDef.format)
                        << "layout(isolines, equal_spacing, ccw ) in;\n"
                        << "layout(location = 0) out float out_color;\n"
                        << "layout(set = 0, binding = 0) uniform Buffer1\n"
@@ -319,7 +316,8 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        const string extensionHeader =  (caseDef.extShaderSubGroupBallotTests ? "#extension GL_ARB_shader_ballot: enable\n"
                                                                                                                                                        "#extension GL_KHR_shader_subgroup_basic: enable\n"
                                                                                                                                                        "#extension GL_ARB_gpu_shader_int64: enable\n"
-                                                                                                                                               :       "#extension GL_KHR_shader_subgroup_ballot: enable\n");
+                                                                                                                                               :       "#extension GL_KHR_shader_subgroup_ballot: enable\n")
+                                                                       + subgroups::getAdditionalExtensionForFormat(caseDef.format);
 
        if (VK_SHADER_STAGE_COMPUTE_BIT == caseDef.shaderStage)
        {
@@ -327,7 +325,6 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
 
                src << "#version 450\n"
                        << extensionHeader.c_str()
-                       << subgroups::getAdditionalExtensionForFormat(caseDef.format)
                        << "layout (local_size_x_id = 0, local_size_y_id = 1, "
                        "local_size_z_id = 2) in;\n"
                        << "layout(set = 0, binding = 0, std430) buffer Buffer1\n"
@@ -357,8 +354,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
        {
                const string vertex =
                        "#version 450\n"
-                       + extensionHeader
-                       + subgroups::getAdditionalExtensionForFormat(caseDef.format) +
+                       + extensionHeader +
                        "layout(set = 0, binding = 0, std430) buffer Buffer1\n"
                        "{\n"
                        "  uint result[];\n"
@@ -381,8 +377,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
 
                const string tesc =
                        "#version 450\n"
-                       + extensionHeader
-                       + subgroups::getAdditionalExtensionForFormat(caseDef.format) +
+                       + extensionHeader +
                        "layout(vertices=1) out;\n"
                        "layout(set = 0, binding = 1, std430) buffer Buffer1\n"
                        "{\n"
@@ -408,8 +403,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
 
                const string tese =
                        "#version 450\n"
-                       + extensionHeader
-                       + subgroups::getAdditionalExtensionForFormat(caseDef.format) +
+                       + extensionHeader +
                        "layout(isolines) in;\n"
                        "layout(set = 0, binding = 2, std430) buffer Buffer1\n"
                        "{\n"
@@ -431,8 +425,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
 
                const string geometry =
                        "#version 450\n"
-                       + extensionHeader
-                       + subgroups::getAdditionalExtensionForFormat(caseDef.format) +
+                       + extensionHeader +
                        "layout(${TOPOLOGY}) in;\n"
                        "layout(points, max_vertices = 1) out;\n"
                        "layout(set = 0, binding = 3, std430) buffer Buffer1\n"
@@ -456,8 +449,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
 
                const string fragment =
                        "#version 450\n"
-                       + extensionHeader
-                       + subgroups::getAdditionalExtensionForFormat(caseDef.format) +
+                       + extensionHeader +
                        "layout(location = 0) out uint result;\n"
                        "layout(set = 0, binding = 4, std430) readonly buffer Buffer1\n"
                        "{\n"