Cleanup atomic intrinsics. (#5324)

* Cleanup atomic intrinsics. * Fix. * Fix glsl. * Remove hacky intrinsic expansion logic for glsl image atomics. * Fix all tests. * Fix. * Add `InterlockedAddF16Emulated`. * Fix glsl intrinsic. * Fix.
shader-slang · Oct 18, 2024 · a618b8c · a618b8c
1 parent 11e1eca
commit a618b8c
Show file tree

Hide file tree

Showing 33 changed files with 4,074 additions and 5,598 deletions.
diff --git a/prelude/slang-cuda-prelude.h b/prelude/slang-cuda-prelude.h
@@ -1261,7 +1261,14 @@ struct ByteAddressBuffer
         memcpy(&data, ((const char*)this->data) + index, sizeof(T));
         return data;
     }
-
+    template<typename T>
+    SLANG_CUDA_CALL StructuredBuffer<T> asStructuredBuffer() const
+    {
+        StructuredBuffer<T> rs;
+        rs.data = (T*)data;
+        rs.count = sizeInBytes / sizeof(T);
+        return rs;
+    }
     const uint32_t* data;
     size_t sizeInBytes;  //< Must be multiple of 4
 };
@@ -1348,7 +1355,14 @@ struct RWByteAddressBuffer
         SLANG_BOUND_CHECK_BYTE_ADDRESS(index, sizeof(T), sizeInBytes);
         return (T*)(((char*)data) + index);
     }
-
+    template<typename T>
+    SLANG_CUDA_CALL RWStructuredBuffer<T> asStructuredBuffer() const
+    {
+        RWStructuredBuffer<T> rs;
+        rs.data = (T*)data;
+        rs.count = sizeInBytes / sizeof(T);
+        return rs;
+    }
     uint32_t* data;
     size_t sizeInBytes; //< Must be multiple of 4 
 };

diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang
@@ -299,6 +299,18 @@ interface __BuiltinSignedArithmeticType : __BuiltinArithmeticType {}
 interface __BuiltinIntegerType : __BuiltinArithmeticType, IInteger
 {}
 
+/// Represent a `int` or `uint` type.
+[sealed]
+[builtin]
+interface __BuiltinInt32Type : __BuiltinIntegerType
+{}
+
+/// Represent a `int64_t` or `uint64_t` type.
+[sealed]
+[builtin]
+interface __BuiltinInt64Type : __BuiltinIntegerType
+{}
+
 /// Represent builtin types that can represent a real number.
 [sealed]
 [builtin]
@@ -602,6 +614,14 @@ ${{{{
 }}}}
     ,  __BuiltinArithmeticType
     ,  __BuiltinIntegerType
+${{{{
+    if (kBaseTypes[tt].tag == BaseType::Int || kBaseTypes[tt].tag == BaseType::UInt)
+}}}}
+    ,  __BuiltinInt32Type
+${{{{
+    if (kBaseTypes[tt].tag == BaseType::Int64 || kBaseTypes[tt].tag == BaseType::UInt64)
+}}}}
+    ,  __BuiltinInt64Type
 ${{{{
         ; // fall through
     case BaseType::Bool: