diff options
| author | Yong He <yonghe@google.com> | 2019-01-29 13:35:23 -0800 |
|---|---|---|
| committer | Yong He <yonghe@google.com> | 2019-01-29 13:35:23 -0800 |
| commit | c1761283e7bb6b5cfcedf910e76fd4f939395b1d (patch) | |
| tree | 40bcf976326a303373d53dae0ff11ef6a5518b3e | |
| parent | d222889d19ff57eda999269d22da6915daedc839 (diff) | |
Add underscores to `AttributeUsage` to signal its preview state.
| -rw-r--r-- | source/slang/core.meta.slang | 4 | ||||
| -rw-r--r-- | source/slang/core.meta.slang.h | 4 | ||||
| -rw-r--r-- | tests/diagnostics/attribute-error.slang | 4 | ||||
| -rw-r--r-- | tests/reflection/attribute.slang | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 54dfc6127..bd01d679a 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -1287,11 +1287,11 @@ attribute_syntax [mutating] : MutatingAttribute; __attributeTarget(FunctionDeclBase) attribute_syntax [__readNone] : ReadNoneAttribute; -enum AttributeTargets +enum _AttributeTargets { Struct = $( (int) UserDefinedAttributeTargets::Struct), Var = $( (int) UserDefinedAttributeTargets::Var), Function = $( (int) UserDefinedAttributeTargets::Function), }; __attributeTarget(StructDecl) -attribute_syntax [AttributeUsage(target : AttributeTargets)] : AttributeUsageAttribute;
\ No newline at end of file +attribute_syntax [__AttributeUsage(target : _AttributeTargets)] : AttributeUsageAttribute;
\ No newline at end of file diff --git a/source/slang/core.meta.slang.h b/source/slang/core.meta.slang.h index f0671396d..448fdb058 100644 --- a/source/slang/core.meta.slang.h +++ b/source/slang/core.meta.slang.h @@ -1305,7 +1305,7 @@ SLANG_RAW(" /// This is equivalent to the LLVM `readnone` function attribute. SLANG_RAW("__attributeTarget(FunctionDeclBase)\n") SLANG_RAW("attribute_syntax [__readNone] : ReadNoneAttribute;\n") SLANG_RAW("\n") -SLANG_RAW("enum AttributeTargets\n") +SLANG_RAW("enum _AttributeTargets\n") SLANG_RAW("{\n") SLANG_RAW(" Struct = ") SLANG_SPLICE( (int) UserDefinedAttributeTargets::Struct @@ -1321,4 +1321,4 @@ SLANG_SPLICE( (int) UserDefinedAttributeTargets::Function SLANG_RAW(",\n") SLANG_RAW("};\n") SLANG_RAW("__attributeTarget(StructDecl)\n") -SLANG_RAW("attribute_syntax [AttributeUsage(target : AttributeTargets)] : AttributeUsageAttribute;") +SLANG_RAW("attribute_syntax [__AttributeUsage(target : _AttributeTargets)] : AttributeUsageAttribute;") diff --git a/tests/diagnostics/attribute-error.slang b/tests/diagnostics/attribute-error.slang index 472593f3b..b913d3d4a 100644 --- a/tests/diagnostics/attribute-error.slang +++ b/tests/diagnostics/attribute-error.slang @@ -4,13 +4,13 @@ //TEST:REFLECTION:-stage compute -entry main -target hlsl -[AttributeUsage(AttributeTargets.Struct)] +[__AttributeUsage(_AttributeTargets.Struct)] struct MyStructAttribute { int iParam; float fParam; }; -[AttributeUsage(AttributeTargets.Var)] +[__AttributeUsage(_AttributeTargets.Var)] struct DefaultValueAttribute { int iParam; diff --git a/tests/reflection/attribute.slang b/tests/reflection/attribute.slang index a3cda4f4b..687148add 100644 --- a/tests/reflection/attribute.slang +++ b/tests/reflection/attribute.slang @@ -4,13 +4,13 @@ //TEST:REFLECTION:-stage compute -entry main -target hlsl -[AttributeUsage(AttributeTargets.Struct)] +[__AttributeUsage(_AttributeTargets.Struct)] struct MyStructAttribute { int iParam; float fParam; }; -[AttributeUsage(AttributeTargets.Var)] +[__AttributeUsage(_AttributeTargets.Var)] struct DefaultValueAttribute { int iParam; |