Merge pull request #812 from csyonghe/attribute

Add support for user defined attributes

2 files changed, 160 insertions, 0 deletions

diff --git a/tests/reflection/attribute.slang b/tests/reflection/attribute.slang
new file mode 100644
index 000000000..687148add
--- /dev/null
+++ b/tests/reflection/attribute.slang
@@ -0,0 +1,42 @@
+// attribute.slang
+
+// Tests reflection of user defined attributes.
+
+//TEST:REFLECTION:-stage compute -entry main -target hlsl
+
+[__AttributeUsage(_AttributeTargets.Struct)]
+struct MyStructAttribute
+{
+    int iParam;
+    float fParam;
+};
+[__AttributeUsage(_AttributeTargets.Var)]
+struct DefaultValueAttribute
+{
+    int iParam;
+};
+
+[MyStruct(0, 1.0)]
+struct A
+{
+    float x;
+    [DefaultValue(1)]
+    float y;
+};
+
+[MyStruct(0, 2.0)]
+struct B
+{
+    float x;
+    [DefaultValue(1+1)]
+    float z;
+};
+
+ParameterBlock<A> param;
+ParameterBlock<B> param2;
+
+[numthreads(1, 1, 1)]
+void main(
+    uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
\ No newline at end of file
diff --git a/tests/reflection/attribute.slang.expected b/tests/reflection/attribute.slang.expected
new file mode 100644
index 000000000..4348b898f
--- /dev/null
+++ b/tests/reflection/attribute.slang.expected
@@ -0,0 +1,118 @@
+result code = 0
+standard error = {
+}
+standard output = {
+{
+    "parameters": [
+        {
+            "name": "param",
+            "binding": {"kind": "constantBuffer", "index": 0},
+            "type": {
+                "kind": "parameterBlock",
+                "elementType": {
+                    "kind": "struct",
+                    "name": "A",
+                    "fields": [
+                        {
+                            "name": "x",
+                            "type": {
+                                "kind": "scalar",
+                                "scalarType": "float32"
+                            },
+                            "binding": {"kind": "uniform", "offset": 0, "size": 4}
+                        },
+                        {
+                            "name": "y",
+                            "type": {
+                                "kind": "scalar",
+                                "scalarType": "float32"
+                            },
+                            "binding": {"kind": "uniform", "offset": 4, "size": 4},
+                            "userAttribs": [{
+                                "name": "DefaultValue",
+                                "arguments": [
+                                    1
+                                ]
+                            }
+                            ]
+                        }
+                    ],
+                    "userAttribs": [{
+                        "name": "MyStruct",
+                        "arguments": [
+                            0,
+                            1.000000
+                        ]
+                    }
+                    ]
+                }
+            }
+        },
+        {
+            "name": "param2",
+            "binding": {"kind": "constantBuffer", "index": 1},
+            "type": {
+                "kind": "parameterBlock",
+                "elementType": {
+                    "kind": "struct",
+                    "name": "B",
+                    "fields": [
+                        {
+                            "name": "x",
+                            "type": {
+                                "kind": "scalar",
+                                "scalarType": "float32"
+                            },
+                            "binding": {"kind": "uniform", "offset": 0, "size": 4}
+                        },
+                        {
+                            "name": "z",
+                            "type": {
+                                "kind": "scalar",
+                                "scalarType": "float32"
+                            },
+                            "binding": {"kind": "uniform", "offset": 4, "size": 4},
+                            "userAttribs": [{
+                                "name": "DefaultValue",
+                                "arguments": [
+                                    2
+                                ]
+                            }
+                            ]
+                        }
+                    ],
+                    "userAttribs": [{
+                        "name": "MyStruct",
+                        "arguments": [
+                            0,
+                            2.000000
+                        ]
+                    }
+                    ]
+                }
+            }
+        }
+    ],
+    "entryPoints": [
+        {
+            "name": "main",
+            "stage:": "compute",
+            "parameters": [
+                {
+                    "name": "dispatchThreadID",
+                    "semanticName": "SV_DISPATCHTHREADID",
+                    "type": {
+                        "kind": "vector",
+                        "elementCount": 3,
+                        "elementType": {
+                            "kind": "scalar",
+                            "scalarType": "uint32"
+                        }
+                    }
+                }
+            ],
+            "threadGroupSize": [1, 1, 1]
+        }
+    ]
+}
+}