Vulkan: Support for geometry shader with max_vertices=0

This is simply done by specifying max_vertices=1. Bug: angleproject:5411 Change-Id: I50318128cca0e96a8b7c7e5d01165b9ef46b4db8 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2574823 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>

Vulkan: Support for geometry shader with max_vertices=0
7354c67b · Shahbaz Youssefi · Commit Bot · aafe855f · 7354c67b · 7354c67b
Commit 7354c67b authored Dec 04, 2020 by Shahbaz Youssefi Committed by Commit Bot Dec 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

TranslatorVulkan.cpp src/compiler/translator/TranslatorVulkan.cpp +8 -3

deqp_gles31_test_expectations.txt src/tests/deqp_support/deqp_gles31_test_expectations.txt +0 -1

No files found.
--- a/src/compiler/translator/TranslatorVulkan.cpp
+++ b/src/compiler/translator/TranslatorVulkan.cpp
@@ -1018,9 +1018,14 @@ bool TranslatorVulkan::translateImpl(TIntermBlock *root,
    }
    else if (getShaderType() == GL_GEOMETRY_SHADER)
    {
-        WriteGeometryShaderLayoutQualifiers(
-            sink, getGeometryShaderInputPrimitiveType(), getGeometryShaderInvocations(),
-            getGeometryShaderOutputPrimitiveType(), getGeometryShaderMaxVertices());
+        int maxVertices = getGeometryShaderMaxVertices();
+
+        // max_vertices=0 is not valid in Vulkan
+        maxVertices = std::max(1, maxVertices);
+
+        WriteGeometryShaderLayoutQualifiers(sink, getGeometryShaderInputPrimitiveType(),
+                                            getGeometryShaderInvocations(),
+                                            getGeometryShaderOutputPrimitiveType(), maxVertices);
    }
    else
    {

--- a/src/tests/deqp_support/deqp_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles31_test_expectations.txt
@@ -202,7 +202,6 @@
 5409 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.random.48 = FAIL
 5409 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.random.51 = FAIL
 5409 VULKAN : dEQP-GLES31.functional.program_interface_query.uniform.random.55 = FAIL
-5411 VULKAN : dEQP-GLES31.functional.geometry_shading.emit.*_emit_0_end_* = FAIL

 // Shader I/O blocks:
 // Missing matching of block names with unnamed SSBOs with the same member variable