diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2023-07-15 01:40:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-14 22:40:11 -0700 |
| commit | 138a44ef272841cb555fa0eb5c49cc889bf1d64a (patch) | |
| tree | e54f195a49a748c378210e635578b29b04e8e176 /source/slang/slang-hlsl-to-vulkan-layout-options.cpp | |
| parent | 3e4fe2f6f2a40bfabc34ca5a97f8c04f631c4d23 (diff) | |
Fix vk-shift-* mapping issue (#2993)
* Fix vk-shift-* mappings.
* Add some doc info about vk-shift.
* Fix diagnostic test.
Diffstat (limited to 'source/slang/slang-hlsl-to-vulkan-layout-options.cpp')
| -rw-r--r-- | source/slang/slang-hlsl-to-vulkan-layout-options.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/slang/slang-hlsl-to-vulkan-layout-options.cpp b/source/slang/slang-hlsl-to-vulkan-layout-options.cpp index bb02a079c..1033c0f56 100644 --- a/source/slang/slang-hlsl-to-vulkan-layout-options.cpp +++ b/source/slang/slang-hlsl-to-vulkan-layout-options.cpp @@ -8,14 +8,16 @@ namespace { // anonymous typedef HLSLToVulkanLayoutOptions::Kind ShiftKind; -/* {b|s|t|u} */ +/* {b|s|t|u} +https://github.com/KhronosGroup/glslang/wiki/HLSL-FAQ +*/ static NamesDescriptionValue s_vulkanShiftKinds[] = { - { ValueInt(ShiftKind::Buffer), "b", "Vulkan Buffer resource" }, - { ValueInt(ShiftKind::Sampler), "s", "Vulkan Sampler resource" }, - { ValueInt(ShiftKind::Texture), "t", "Vulkan Texture resource" }, - { ValueInt(ShiftKind::Uniform), "u", "Vulkan Uniform resource" }, + { ValueInt(ShiftKind::ConstantBuffer), "b", "Constant buffer view" }, + { ValueInt(ShiftKind::Sampler), "s", "Sampler" }, + { ValueInt(ShiftKind::ShaderResource), "t", "Shader resource view" }, + { ValueInt(ShiftKind::UnorderedAccess), "u", "Unorderd access view" }, }; } // anonymous @@ -136,10 +138,10 @@ HLSLToVulkanLayoutOptions::Binding HLSLToVulkanLayoutOptions::inferBinding(Kind case ParameterCategory::Uniform: case ParameterCategory::ConstantBuffer: { - return Kind::Uniform; + return Kind::ConstantBuffer; } - case ParameterCategory::ShaderResource: return Kind::Texture; - case ParameterCategory::UnorderedAccess: return Kind::Buffer; + case ParameterCategory::ShaderResource: return Kind::ShaderResource; + case ParameterCategory::UnorderedAccess: return Kind::UnorderedAccess; case ParameterCategory::SamplerState: return Kind::Sampler; default: |