Add missing gl_PointSize in subgroup test shaders when drawing points

Affects: dEQP-VK.subgroups.*vertex_framebuffer

Components: Vulkan

VK-GL-CTS issue: 872

Change-Id: Iddf8362024d3dd750e6f0b9d4c71e1adcdfa63ca

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
index 5a3e88d..3f59a9c 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
@@ -545,6 +545,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << bdy.str()
                        << "  out_color = float(tempResult);\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index 6842a72..cb795cb 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
@@ -235,6 +235,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << bdy.str()
                        << "  out_color = float(tempResult);\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
index 27bcd5b..bde692a 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
@@ -325,6 +325,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << bdy.str()
                        << "  out_color = float(tempResult);\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
index 595c8d8..9106635 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
@@ -159,6 +159,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << "  tempResult |= uvec4(0) == subgroupBallot(false) ? 0x4 : 0;\n"
                        << "  out_color = float(tempResult);\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
index 33f082d..68d6559 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
@@ -415,6 +415,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                << "    out_color.g = 0.0f;\n"
                                << "  }\n"
                                << "  gl_Position = in_position;\n"
+                               << "  gl_PointSize = 1.0f;\n"
                                << "}\n";
                        programCollection.glslSources.add("vert")
                                        << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
@@ -535,6 +536,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                << "  out_color.g = float(value);\n"
                                << "  out_color.a = float(tempResult2);\n"
                                << "  gl_Position = in_position;\n"
+                               << "  gl_PointSize = 1.0f;\n"
                                << "}\n";
 
                        programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
index bec6b2d..3a0ad0e 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
@@ -207,6 +207,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                                        << bdy.str()
                                        << "  out_color = float(tempResult);\n"
                                        << "  gl_Position = in_position;\n"
+                                       << "  gl_PointSize = 1.0f;\n"
                                        << "}\n";
                programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);
 

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
index e3a2481..e5aaf8a 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
@@ -409,6 +409,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                        << "{\n"
                        << "  out_color = uvec4(gl_SubgroupSize, gl_SubgroupInvocationID, 1.0f, 1.0f);\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
index 119a7d9..d66cfec 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
@@ -214,6 +214,7 @@ void initFrameBufferPrograms (SourceCollections& programCollection, CaseDefiniti
                        << "    result = 1.0f; // Invocation we read from was inactive, so we can't verify results!\n"
                        << "  }\n"
                        << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(src.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
index baa5348..3414739 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
@@ -279,6 +279,7 @@ void initFrameBufferPrograms(SourceCollections& programCollection, CaseDefinitio
                }
 
                vertexSrc << "  gl_Position = in_position;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert") << glu::VertexSource(vertexSrc.str()) << vk::ShaderBuildOptions(vk::SPIRV_VERSION_1_3, 0u);