Added PointSize in shader used for drawing points

Follow-up change of 76a3efb8583de58358570c912e4388a780a2cb39.

A SPIR-V assembly shader with undefined PointSize was being used with
point list topology.

Affects:

dEQP-VK.subgroups.*

Components: Vulkan

VK-GL-CTS issue: 1197,1552

Change-Id: I10404d8fe45b9fb7484d1b90b984e66ca8569de4

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
index 718be21..4837c87 100755 (executable)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
@@ -535,6 +535,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                "  float pixelSize = 2.0f/1024.0f;\n"
                                "  float pixelPosition = pixelSize/2.0f - 1.0f;\n"
                                "  gl_Position = vec4(float(gl_VertexIndex) * pixelSize + pixelPosition, 0.0f, 0.0f, 1.0f);\n"
+                               "  gl_PointSize = 1.0f;\n"
                                "}\n";
 
                        programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
index 1abe256..9a25d95 100755 (executable)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
@@ -406,6 +406,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                "  float pixelSize = 2.0f/1024.0f;\n"
                                "  float pixelPosition = pixelSize/2.0f - 1.0f;\n"
                                "  gl_Position = vec4(float(gl_VertexIndex) * pixelSize + pixelPosition, 0.0f, 0.0f, 1.0f);\n"
+                               "  gl_PointSize = 1.0f;\n"
                                "}\n";
                        programCollection.glslSources.add("vert")
                                << glu::VertexSource(vertex) << vk::ShaderBuildOptions(programCollection.usedVulkanVersion, vk::SPIRV_VERSION_1_3, 0u);

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
index e32862d..6de82b9 100755 (executable)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShapeTests.cpp
@@ -336,6 +336,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                "  float pixelSize = 2.0f/1024.0f;\n"
                                "  float pixelPosition = pixelSize/2.0f - 1.0f;\n"
                                "  gl_Position = vec4(float(gl_VertexIndex) * pixelSize + pixelPosition, 0.0f, 0.0f, 1.0f);\n"
+                               "  gl_PointSize = 1.0f;\n"
                                "}\n";
 
                        programCollection.glslSources.add("vert")