diff options
| author | Yong He <yonghe@outlook.com> | 2023-11-16 14:32:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-16 14:32:33 -0800 |
| commit | 4c78efd0c34442866f20e9d00bbb6908115c9a01 (patch) | |
| tree | 03ca8584847f0937a926f6b27386dcd982ed7780 /source/slang/slang-reflection-api.cpp | |
| parent | 12f7237e4060388494c549623f4a640327b7ca08 (diff) | |
Unify stdlib `Texture` types into one generic type. (#3327)
* Unify Texture types in stdlib into 1 generic type.
* Fixes.
* Fix.
* Fixes.
* Fix reflection.
* Fix binding reflection.
* Add gather intrinsics.
* Fix gather intrinsics.
* Fix texture type toText.
* Fix intrinsic.
* fix cuda intrinsic.
* Fix project files.
* cleanup.
* Fix.
* Fix.
* Fix sampler feedback test.
* Fix getDimension intrinsics.
* Fix spirv sample image intrinsics.
* Fix test.
* Fix GLSL intrinsic.
* Cleanup.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'source/slang/slang-reflection-api.cpp')
| -rw-r--r-- | source/slang/slang-reflection-api.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 3a521589e..f0540deb3 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -1263,12 +1263,11 @@ namespace Slang SlangBindingType _calcResourceBindingType( Type* type) { - if(const auto combinedTextureSamplerType = as<TextureSamplerType>(type)) - { - return SLANG_BINDING_TYPE_COMBINED_TEXTURE_SAMPLER; - } - else if( auto resourceType = as<ResourceType>(type) ) + if( auto resourceType = as<ResourceType>(type) ) { + if (resourceType->isCombined()) + return SlangBindingType(SLANG_BINDING_TYPE_COMBINED_TEXTURE_SAMPLER); + auto shape = resourceType->getBaseShape(); auto access = resourceType->getAccess(); |