fixed tests and cleanup

shader-slang · Dec 10, 2024 · fda2279 · fda2279
1 parent 350f46a
commit fda2279
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/source/slang/slang-ast-modifier.h b/source/slang/slang-ast-modifier.h
@@ -709,6 +709,14 @@ class UncheckedGLSLBindingLayoutAttribute : public UncheckedGLSLLayoutAttribute
     SLANG_UNREFLECTED
 };
 
+// GLSL `set` layout qualifier, does not include `binding`.
+class UncheckedGLSLSetLayoutAttribute : public UncheckedGLSLLayoutAttribute
+{
+    SLANG_AST_CLASS(UncheckedGLSLSetLayoutAttribute)
+
+    SLANG_UNREFLECTED
+};
+
 // GLSL `offset` layout qualifier.
 class UncheckedGLSLOffsetLayoutAttribute : public UncheckedGLSLLayoutAttribute
 {

diff --git a/source/slang/slang-check-modifier.cpp b/source/slang/slang-check-modifier.cpp
@@ -1475,8 +1475,8 @@ AttributeBase* SemanticsVisitor::checkGLSLLayoutAttribute(
     // attribute.
     bool addNode = true;
 
-    const auto& name = uncheckedAttr->getKeywordName()->text;
-    if (as<UncheckedGLSLBindingLayoutAttribute>(uncheckedAttr) || name == "set")
+    if (as<UncheckedGLSLBindingLayoutAttribute>(uncheckedAttr) ||
+        as<UncheckedGLSLSetLayoutAttribute>(uncheckedAttr))
     {
         // Binding and set are coupled together as a descriptor table slot resource for codegen.
         // Attempt to retrieve and annotate an existing binding attribute or create a new one.

diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
@@ -1037,6 +1037,10 @@ static Modifier* parseUncheckedGLSLLayoutAttribute(Parser* parser, NameLoc& name
         // through the list builder when implicitly injecting an offset qualifier.
         attr = parser->astBuilder->create<UncheckedGLSLOffsetLayoutAttribute>();
     }
+    else if (nameLoc.name->text == "set")
+    {
+        attr = parser->astBuilder->create<UncheckedGLSLSetLayoutAttribute>();
+    }
     else
     {
         attr = parser->astBuilder->create<UncheckedGLSLLayoutAttribute>();

diff --git a/tests/bugs/glsl-layout-define.hlsl.expected b/tests/bugs/glsl-layout-define.hlsl.expected
@@ -1,11 +1,15 @@
 result code = -1
 standard error = {
-tests/bugs/glsl-layout-define.hlsl(4): error 20001: unexpected identifier, expected integer literal
+tests/bugs/glsl-layout-define.hlsl(4): error 30015: undefined identifier 'UNDEFINED_VK_BINDING'.
     binding = UNDEFINED_VK_BINDING,
               ^~~~~~~~~~~~~~~~~~~~
-tests/bugs/glsl-layout-define.hlsl(5): error 20001: unexpected identifier, expected integer literal
+tests/bugs/glsl-layout-define.hlsl(5): error 30015: undefined identifier 'UNDEFINED_VK_SET'.
     set = UNDEFINED_VK_SET)
           ^~~~~~~~~~~~~~~~
+(0): error 30015: undefined identifier 'main'.
+tests/bugs/glsl-layout-define.hlsl(3): error 38000: no function found matching entry point name 'main'
+layout(
+^~~~~~
 }
 standard output = {
 }
diff --git a/tests/hlsl-intrinsic/image-swizzle-write.slang b/tests/hlsl-intrinsic/image-swizzle-write.slang
@@ -1,7 +1,7 @@
 //TEST:SIMPLE(filecheck=CHECK): -entry computeMain -stage compute -target spirv -emit-spirv-directly
 //TEST:SIMPLE(filecheck=CHECK): -entry computeMain -stage compute -target spirv
 
-layout(rgba6f)
+layout(rgba8)
 RWTexture2D<float4> texture;
 
 [numthreads(4, 1, 1)]