ES31: Allow function call, unary, ternary operators in SSBO

src/compiler/translator/ShaderStorageBlockOutputHLSL.cpp

@@ -221,8 +221,22 @@ void ShaderStorageBlockOutputHLSL::visitSymbol(TIntermSymbol *node)
 
 void ShaderStorageBlockOutputHLSL::visitConstantUnion(TIntermConstantUnion *node)
 {
-    TInfoSinkBase &out = mOutputHLSL->getInfoSink();
-    mOutputHLSL->writeConstantUnion(out, node->getType(), node->getConstantValue());
+    mOutputHLSL->visitConstantUnion(node);
+}
+
+bool ShaderStorageBlockOutputHLSL::visitAggregate(Visit visit, TIntermAggregate *node)
+{
+    return mOutputHLSL->visitAggregate(visit, node);
+}
+
+bool ShaderStorageBlockOutputHLSL::visitTernary(Visit visit, TIntermTernary *node)
+{
+    return mOutputHLSL->visitTernary(visit, node);
+}
+
+bool ShaderStorageBlockOutputHLSL::visitUnary(Visit visit, TIntermUnary *node)
+{
+    return mOutputHLSL->visitUnary(visit, node);
 }
 
 bool ShaderStorageBlockOutputHLSL::visitSwizzle(Visit visit, TIntermSwizzle *node)

src/compiler/translator/ShaderStorageBlockOutputHLSL.h

@@ -53,6 +53,9 @@ class ShaderStorageBlockOutputHLSL : public TIntermTraverser
     void visitConstantUnion(TIntermConstantUnion *) override;
     bool visitSwizzle(Visit visit, TIntermSwizzle *node) override;
     bool visitBinary(Visit visit, TIntermBinary *) override;
+    bool visitAggregate(Visit visit, TIntermAggregate *node) override;
+    bool visitTernary(Visit visit, TIntermTernary *) override;
+    bool visitUnary(Visit visit, TIntermUnary *) override;
 
   private:
     void traverseSSBOAccess(TIntermTyped *node, SSBOMethod method);

src/tests/gl_tests/ShaderStorageBufferTest.cpp

@@ -462,6 +462,75 @@ TEST_P(ShaderStorageBufferTest31, MultiStorageBuffersForMultiPrograms)
     EXPECT_GL_NO_ERROR();
 }
 
+// Test that function calling is supported in SSBO access chain.
+TEST_P(ShaderStorageBufferTest31, FunctionCallInSSBOAccessChain)
+{
+    constexpr char kComputeShaderSource[] =
+        R"(#version 310 es
+layout (local_size_x=4) in;
+highp uint getIndex (in highp uvec2 localID, uint element)
+{
+    return localID.x + element;
+}
+layout(binding=0, std430) buffer Storage
+{
+    highp uint values[];
+} sb_store;
+
+void main()
+{
+    sb_store.values[getIndex(gl_LocalInvocationID.xy, 0u)] = gl_LocalInvocationIndex;
+}
+)";
+
+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
+    EXPECT_GL_NO_ERROR();
+}
+
+// Test that unary operator is supported in SSBO access chain.
+TEST_P(ShaderStorageBufferTest31, UnaryOperatorInSSBOAccessChain)
+{
+    constexpr char kComputeShaderSource[] =
+        R"(#version 310 es
+layout (local_size_x=4) in;
+layout(binding=0, std430) buffer Storage
+{
+    highp uint values[];
+} sb_store;
+
+void main()
+{
+    uint invocationNdx = gl_LocalInvocationIndex;
+    sb_store.values[++invocationNdx] = invocationNdx;
+}
+)";
+
+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
+    EXPECT_GL_NO_ERROR();
+}
+
+// Test that ternary operator is supported in SSBO access chain.
+TEST_P(ShaderStorageBufferTest31, TernaryOperatorInSSBOAccessChain)
+{
+    constexpr char kComputeShaderSource[] =
+        R"(#version 310 es
+layout (local_size_x=4) in;
+layout(binding=0, std430) buffer Storage
+{
+    highp uint values[];
+} sb_store;
+
+void main()
+{
+    sb_store.values[gl_LocalInvocationIndex > 2u ? gl_NumWorkGroups.x : gl_NumWorkGroups.y]
+            = gl_LocalInvocationIndex;
+}
+)";
+
+    ANGLE_GL_COMPUTE_PROGRAM(program, kComputeShaderSource);
+    EXPECT_GL_NO_ERROR();
+}
+
 ANGLE_INSTANTIATE_TEST(ShaderStorageBufferTest31, ES31_OPENGL(), ES31_OPENGLES(), ES31_D3D11());
 
 }  // namespace