diff options
| author | Yong He <yonghe@outlook.com> | 2023-09-19 07:21:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 22:21:17 +0800 |
| commit | 6542d472c9a144818e3e23349e31ae281bbfa499 (patch) | |
| tree | 29b349106d506bf27f30e9be7984cc96c5a38f62 | |
| parent | d1efc69a20d941116d1398e4471689658cd6b888 (diff) | |
Direct SPIRV ParameterBlock fix. (#3212)
Co-authored-by: Yong He <yhe@nvidia.com>
| -rw-r--r-- | source/slang/slang-emit.cpp | 9 | ||||
| -rw-r--r-- | source/slang/slang-ir-spirv-legalize.cpp | 3 | ||||
| -rw-r--r-- | tests/expected-failure.txt | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/source/slang/slang-emit.cpp b/source/slang/slang-emit.cpp index 543bb089d..c77f2a6ce 100644 --- a/source/slang/slang-emit.cpp +++ b/source/slang/slang-emit.cpp @@ -887,9 +887,12 @@ Result linkAndOptimizeIR( // above) legalizeMeshOutputTypes(irModule); - // We need to lower any types used in a buffer resource (e.g. ContantBuffer or StructuredBuffer) into - // a simple storage type that has target independent layout based on the kind of buffer resource. - lowerBufferElementTypeToStorageType(targetRequest, irModule); + if (options.shouldLegalizeExistentialAndResourceTypes) + { + // We need to lower any types used in a buffer resource (e.g. ContantBuffer or StructuredBuffer) into + // a simple storage type that has target independent layout based on the kind of buffer resource. + lowerBufferElementTypeToStorageType(targetRequest, irModule); + } // Rewrite functions that return arrays to return them via `out` parameter, // since our target languages doesn't allow returning arrays. diff --git a/source/slang/slang-ir-spirv-legalize.cpp b/source/slang/slang-ir-spirv-legalize.cpp index 48c118486..69abaa108 100644 --- a/source/slang/slang-ir-spirv-legalize.cpp +++ b/source/slang/slang-ir-spirv-legalize.cpp @@ -254,8 +254,7 @@ struct SPIRVLegalizationContext : public SourceEmitterBase // Opaque resource handles can't be in Uniform for Vulkan, if they are // placed here then put them in UniformConstant instead - if (storageClass == SpvStorageClassUniform - && isSpirvUniformConstantType(inst->getDataType())) + if (isSpirvUniformConstantType(inst->getDataType())) { storageClass = SpvStorageClassUniformConstant; } diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt index b3efed2d1..ae1aaf9bd 100644 --- a/tests/expected-failure.txt +++ b/tests/expected-failure.txt @@ -1,4 +1,3 @@ -tests/autodiff/global-param-hoisting.slang.1 (vk) tests/language-feature/constants/constexpr-loop.slang.1 (vk) tests/optimization/func-resource-result/func-resource-result-complex.slang.1 (vk) tests/type/texture-sampler/texture-sampler-2d.slang (vk) |