Merge pull request #2090 from amdrexu/bugfix

SPIRV/GlslangToSpv.cpp

@@ -4731,7 +4731,7 @@ spv::Id TGlslangToSpvTraverser::createImageTextureFunctionCall(glslang::TIntermO
             // imageAtomicStore has a void return type so base the pointer type on
             // the type of the value operand.
             if (node->getOp() == glslang::EOpImageAtomicStore) {
-                resultTypeId = builder.makePointer(spv::StorageClassImage, builder.getTypeId(operands[2].word));                
+                resultTypeId = builder.makePointer(spv::StorageClassImage, builder.getTypeId(*opIt));
             } else {
                 resultTypeId = builder.makePointer(spv::StorageClassImage, resultType());
             }

Test/baseResults/spv.memoryScopeSemantics.comp.out

 spv.memoryScopeSemantics.comp
 // Module Version 10300
 // Generated by (magic number): 80008
-// Id's are bound by 167
+// Id's are bound by 169
 
                               Capability Shader
                               Capability Int64
@@ -181,6 +181,7 @@ spv.memoryScopeSemantics.comp
              163:             TypeImage 6(int) 2D multi-sampled nonsampled format:R32i
              164:             TypePointer UniformConstant 163
     165(imageMS):    164(ptr) Variable UniformConstant
+             167:      6(int) Constant 4294967289
          4(main):           2 Function None 3
                5:             Label
         8(origi):      7(ptr) Variable Function
@@ -280,5 +281,7 @@ spv.memoryScopeSemantics.comp
              162:     15(int) AtomicIAdd 160 12 42 16
              166:     40(ptr) ImageTexelPointer 165(imageMS) 39 12
                               AtomicStore 166 12 33 14
+             168:     40(ptr) ImageTexelPointer 36(imagei) 39 17
+                              AtomicStore 168 12 33 167
                               Return
                               FunctionEnd

Test/spv.memoryScopeSemantics.comp

@@ -69,5 +69,6 @@ void main()
     atomicAdd(bufferu.x, 5u, gl_ScopeDevice, 0, gl_SemanticsVolatile);
 
     imageAtomicStore(imageMS, ivec2(0,0), 1, 4, gl_ScopeDevice, gl_StorageSemanticsBuffer, gl_SemanticsRelease);
+    imageAtomicStore(imagei, ivec2(0,0), -7, gl_ScopeDevice, gl_StorageSemanticsBuffer, gl_SemanticsRelease);
 }