From 03a5bb4bc0391e2de3c2dfb9ff3213bc0ccd9664 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Wed, 9 Aug 2023 10:54:41 -0700
Subject: Various fixes in GLSL emit. (#3074)

* Fix name mangling of modified types.

* Add `InterlockedAdd(__ref uint, int)` overload.

* Fix.

* Fix type error in ImageStore legalization.

---------

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/hlsl.meta.slang            |  6 +++++-
 source/slang/slang-ir-glsl-legalize.cpp | 14 ++++----------
 source/slang/slang-mangle.cpp           | 13 +++++++++++++
 3 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'source/slang')

diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index 1ab046b19..56ad32326 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -2366,6 +2366,10 @@ __target_intrinsic(glsl, "$atomicAdd($A, $1)")
 __target_intrinsic(cuda, "atomicAdd((uint*)$0, $1)")
 void InterlockedAdd(__ref uint dest, uint value);
 
+__target_intrinsic(glsl, "$atomicAdd($A, $1)")
+__target_intrinsic(cuda, "atomicAdd((uint*)$0, $1)")
+void InterlockedAdd(__ref uint dest, int value);
+
 __target_intrinsic(glsl, "($2 = $atomicAdd($A, $1))")
 __target_intrinsic(cuda, "(*$2 = atomicAdd($0, $1))")
 void InterlockedAdd(__ref  int dest,  int value, out  int original_value);
@@ -7770,4 +7774,4 @@ ${{{{
 
 ${{{{
 }
-}}}}
\ No newline at end of file
+}}}}
diff --git a/source/slang/slang-ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp
index dfe370d2b..a5bb299c5 100644
--- a/source/slang/slang-ir-glsl-legalize.cpp
+++ b/source/slang/slang-ir-glsl-legalize.cpp
@@ -79,26 +79,20 @@ void legalizeImageSubscriptStoreForGLSL(IRBuilder& builder, IRInst* storeInst)
             // Here we assume the imageElementType is already lowered into float4/uint4 types from any
             // user-defined type.
             assert(imageElementType->getOp() == kIROp_VectorType);
-            auto originalValue = builder.emitImageLoad(imageElementType, imageSubscript->getImage(), legalizedCoord);
+            auto vectorBaseType = getIRVectorBaseType(imageElementType);
+            IRType* vector4Type = builder.getVectorType(vectorBaseType, 4);
+            auto originalValue = builder.emitImageLoad(vector4Type, imageSubscript->getImage(), legalizedCoord);
             Array<IRInst*, 4> indices;
             for (UInt i = 0; i < swizzledStore->getElementCount(); i++)
             {
                 indices.add(swizzledStore->getElementIndex(i));
             }
             auto newValue = builder.emitSwizzleSet(
-                imageElementType,
+                vector4Type,
                 originalValue,
                 swizzledStore->getSource(),
                 swizzledStore->getElementCount(),
                 indices.getBuffer());
-            if (getIRVectorElementSize(imageElementType) != 4)
-            {
-                auto vectorBaseType = getIRVectorBaseType(imageElementType);
-                newValue = builder.emitVectorReshape(
-                    builder.getVectorType(
-                        vectorBaseType, builder.getIntValue(builder.getIntType(), 4)),
-                    newValue);
-            }
             auto imageStore = builder.emitImageStore(
                 builder.getVoidType(), imageSubscript->getImage(), legalizedCoord, newValue);
             storeInst->replaceUsesWith(imageStore);
diff --git a/source/slang/slang-mangle.cpp b/source/slang/slang-mangle.cpp
index b27a45484..6a3a17caa 100644
--- a/source/slang/slang-mangle.cpp
+++ b/source/slang/slang-mangle.cpp
@@ -251,6 +251,15 @@ namespace Slang
             for(Index i = 0; i < n; ++i)
                 emitType(context, tupleType->getMember(i));
         }
+        else if (auto modifiedType = dynamicCast<ModifiedType>(type))
+        {
+            emitRaw(context, "Tm");
+            emitType(context, modifiedType->getBase());
+            auto n = modifiedType->getModifierCount();
+            emit(context, n);
+            for (Index i = 0; i < n; ++i)
+                emitVal(context, modifiedType->getModifier(i));
+        }
         else
         {
             SLANG_UNEXPECTED("unimplemented case in type mangling");
@@ -336,6 +345,10 @@ namespace Slang
             emitVal(context, typecastIntVal->getType());
             emitVal(context, typecastIntVal->getBase());
         }
+        else if (auto modifier = as<ModifierVal>(val))
+        {
+            emitNameImpl(context, UnownedStringSlice(modifier->getClassInfo().m_name));
+        }
         else
         {
             SLANG_UNEXPECTED("unimplemented case in val mangling");
-- 
cgit v1.2.3