Vulkan: SPIR-V Gen: Default uniforms

Default uniforms are gathered in a uniform block, so treat them like other nameless uniform block fields. Bug: angleproject:4889 Change-Id: If340040ab4c59f3243c40de7daba530b2289e147 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2939333Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: SPIR-V Gen: Default uniforms
d769742c · Shahbaz Youssefi · Angle LUCI CQ · 7108e069 · d769742c · d769742c
Commit d769742c authored Jun 03, 2021 by Shahbaz Youssefi Committed by Angle LUCI CQ Jun 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

OutputSPIRV.cpp src/compiler/translator/OutputSPIRV.cpp +3 -2

GLSLTest.cpp src/tests/gl_tests/GLSLTest.cpp +3 -6

No files found.
--- a/src/compiler/translator/OutputSPIRV.cpp
+++ b/src/compiler/translator/OutputSPIRV.cpp
@@ -271,8 +271,9 @@ spv::StorageClass GetStorageClass(const TType &type)
        return spv::StorageClassOutput;
    }
-    // Uniform and storage buffers have the Uniform storage class
+    // Uniform and storage buffers have the Uniform storage class.  Default uniforms are gathered in
-    if (type.isInterfaceBlock())
+    // a uniform block as well.
+    if (type.isInterfaceBlock() || qualifier == EvqUniform)
    {
        // I/O blocks must have already been classified as input or output above.
        ASSERT(!IsShaderIoBlock(qualifier));

--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -10888,14 +10888,11 @@ TEST_P(GLSLTest_ES3, InitGlobalNonConstant)
    constexpr char kVS[] = R"(#version 300 es
 #extension GL_EXT_shader_non_constant_global_initializers : require
-uniform U
+uniform vec4 u;
-{
-vec4 u;
-} u;
 out vec4 color;
-vec4 global1 = u.u;
+vec4 global1 = u;
-vec4 global2 = u.u + vec4(1);
+vec4 global2 = u + vec4(1);
 vec4 global3 = global1 * global2;
 void main()
 {