diff options
| author | Yong He <yonghe@outlook.com> | 2023-05-02 20:29:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-02 20:29:38 -0700 |
| commit | d52376a65f37fcbbb67428b917fd3819436b6dfb (patch) | |
| tree | da25b3c9a00bd003b1970b4a6c4eb38eccf62aa1 /source/slang/core.meta.slang | |
| parent | 55291b0bf6d729fcbaf75a01926da7da8975b8e9 (diff) | |
Various dxc/fxc compatibility fixes. (#2863)
* Various dxc/fxc compatibility fixes.
* Cleanup.
* Fix test cases.
* Fix comments.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'source/slang/core.meta.slang')
| -rw-r--r-- | source/slang/core.meta.slang | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 6a35f496b..a2ed1d1df 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -762,6 +762,8 @@ struct String } }; +typedef String string; + __magic_type(NativeStringType) __intrinsic_type($(kIROp_NativeStringType)) struct NativeString @@ -1334,8 +1336,8 @@ for (int tt = 0; tt < kBaseTextureTypeCount; ++tt) } // `GetDimensions` - - for(int isFloat = 0; isFloat < 2; ++isFloat) + const char* dimParamTypes[] = {"out float ", "out int ", "out uint "}; + for(auto t : dimParamTypes) for(int includeMipInfo = 0; includeMipInfo < 2; ++includeMipInfo) { { @@ -1417,8 +1419,6 @@ for (int tt = 0; tt < kBaseTextureTypeCount; ++tt) sb << ")\")\n"; } - char const* t = isFloat ? "out float " : "out uint "; - sb << "[__readNone]\n"; sb << "void GetDimensions("; if(includeMipInfo) @@ -2967,6 +2967,12 @@ attribute_syntax [vk_index(index : int)] : GLSLIndexAttribute; __attributeTarget(FuncDecl) attribute_syntax [vk_spirv_instruction(op : int, set : String = "")] : SPIRVInstructionOpAttribute; +__attributeTarget(FuncDecl) +attribute_syntax [spv_target_env_1_3] : SPIRVTargetEnv13Attribute; + +__attributeTarget(VarDeclBase) +attribute_syntax [disable_array_flattening] : DisableArrayFlatteningAttribute; + // Statement Attributes __attributeTarget(LoopStmt) |