Added missing gl_PointSizes when drawing points

Some tests using point list primitive topology were not specifying point
sizes with the gl_PointSize built-in.

Affects:

dEQP-VK.subgroups.*
dEQP-VK.synchronization.*

Components: Vulkan

VK-GL-CTS issue: 1035

Change-Id: I8588e26ee47c58f6ec4e9ee5fdce70546ec28903

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
index 3f59a9c..2377030 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
@@ -705,6 +705,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "  uvec4 mask = subgroupBallot(true);\n"
                        << bdy.str()
                        << "  result[gl_VertexIndex] = tempResult;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
index cb795cb..bb51610 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
@@ -389,6 +389,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "  uvec4 mask = subgroupBallot(true);\n"
                        << bdy.str()
                        << "  result[gl_VertexIndex] = tempResult;\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 bde692a..68a89e6 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
@@ -546,6 +546,7 @@ void initPrograms (SourceCollections& programCollection, CaseDefinition caseDef)
                        << "{\n"
                        << bdy.str()
                        << "  result[gl_VertexIndex] = tempResult;\n"
+                       << "  gl_PointSize = 1.0;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
index 9106635..bce6d87 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
@@ -266,6 +266,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "  tempResult |= !bool(uvec4(0) == subgroupBallot(bData)) ? 0x2 : 0;\n"
                        << "  tempResult |= uvec4(0) == subgroupBallot(false) ? 0x4 : 0;\n"
                        << "  result[gl_VertexIndex] = tempResult;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
index 68d6559..0b9e7d1 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
@@ -641,6 +641,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                << "  {\n"
                                << "    result[gl_VertexIndex] = " << UNELECTED_VALUE << ";\n"
                                << "  }\n"
+                               << "  gl_PointSize = 1.0f;\n"
                                << "}\n";
 
                        programCollection.glslSources.add("vert")
@@ -918,6 +919,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                << "  uint tempResult = 0;\n"
                                << bdy.str()
                                << "  result[gl_VertexIndex] = tempResult;\n"
+                               << "  gl_PointSize = 1.0f;\n"
                                << "}\n";
 
                        programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
index 3a0ad0e..55d18b8 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinMaskVarTests.cpp
@@ -291,6 +291,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "{\n"
                        << bdy.str()
                        << "  result[gl_VertexIndex] = tempResult;\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
index e5aaf8a..c9397a1 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBuiltinVarTests.cpp
@@ -489,6 +489,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "void main (void)\n"
                        << "{\n"
                        << "  result[gl_VertexIndex] = uvec4(gl_SubgroupSize, gl_SubgroupInvocationID, 0, 0);\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
index d66cfec..1a7f657 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
@@ -392,6 +392,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                        << "  {\n"
                        << "    result[gl_VertexIndex] = 1; // Invocation we read from was inactive, so we can't verify results!\n"
                        << "  }\n"
+                       << "  gl_PointSize = 1.0f;\n"
                        << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
index 3414739..49af22b 100644 (file)
--- a/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
+++ b/external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
@@ -452,6 +452,7 @@ void initPrograms(SourceCollections& programCollection, CaseDefinition caseDef)
                                << "(data[0]) ? 0x4 : 0;\n";
                }
 
+               src << "  gl_PointSize = 1.0f;\n";
                src << "}\n";
 
                programCollection.glslSources.add("vert")

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
index 77c166a..2e994f1 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp
@@ -1115,6 +1115,7 @@ public:
                                << "void main (void)\n"
                                << "{\n"
                                << "   sb_out.result[gl_VertexIndex] = int(gl_VertexIndex);\n"
+                               << "   gl_PointSize = 1.0f;\n"
                                << "}\n";
                        programCollection.glslSources.add("vert_0") << glu::VertexSource(src.str());
                }
@@ -1131,6 +1132,7 @@ public:
                                << "    {\n"
                                << "            sb_out.result[ndx] = int(ndx);\n"
                                << "    }\n"
+                               << "    gl_PointSize = 1.0f;\n"
                                << "}\n";
                        programCollection.glslSources.add("vert_1") << glu::VertexSource(src.str());
                }
@@ -1147,6 +1149,7 @@ public:
                                << "    {\n"
                                << "            sb_out.result[uint(ndx)] = ndx;\n"
                                << "    }\n"
+                               << "    gl_PointSize = 1.0f;\n"
                                << "}\n";
                        programCollection.glslSources.add("vert_2") << glu::VertexSource(src.str());
                }

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp
index 7b947cd..e9de507 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp
@@ -3360,6 +3360,7 @@ public:
                                << "void main (void)\n"
                                << "{\n"
                                << "    b_out.data[gl_VertexIndex] = v_in_data;\n"
+                               << "    gl_PointSize = 1.0f;\n"
                                << "}\n";
                        programCollection.glslSources.add("input_vert") << glu::VertexSource(src.str());
                }