diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-07-17 15:13:37 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-07-17 15:13:37 -0700 |
| commit | ff4621460a98f34d74e4275841c313400cbda0dd (patch) | |
| tree | a8f6a2334397ade3981f35d1ee764a4c325e0927 /source/slang/reflection.cpp | |
| parent | 0059ccb3997c2af87bc3f76524d8cd4787c20b7e (diff) | |
Handle `Buffer` types more like textures
Fixes #94
We'd been handling HLSL `Buffer` and `RWBuffer` in a one-off fashion, and that led to a lot of code duplication, and also to the issue that we weren't handling `RasterizerOrderedBuffer` at all.
This change basically folds `Buffer` in so that it is conceptually a texture type (just with a unique shape). Hopefully all the other logic still works.
Diffstat (limited to 'source/slang/reflection.cpp')
| -rw-r--r-- | source/slang/reflection.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/source/slang/reflection.cpp b/source/slang/reflection.cpp index aaeae5595..18fa3362d 100644 --- a/source/slang/reflection.cpp +++ b/source/slang/reflection.cpp @@ -123,10 +123,6 @@ SLANG_API SlangTypeKind spReflectionType_GetKind(SlangReflectionType* inType) return SLANG_TYPE_KIND_RESOURCE; \ } while(0) - CASE(HLSLBufferType); - CASE(HLSLRWBufferType); - CASE(HLSLBufferType); - CASE(HLSLRWBufferType); CASE(HLSLStructuredBufferType); CASE(HLSLRWStructuredBufferType); CASE(HLSLAppendStructuredBufferType); @@ -342,10 +338,6 @@ SLANG_API SlangResourceShape spReflectionType_GetResourceShape(SlangReflectionTy return SHAPE; \ } while(0) - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); CASE(HLSLStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ); CASE(HLSLRWStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); CASE(HLSLAppendStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_APPEND); @@ -379,10 +371,6 @@ SLANG_API SlangResourceAccess spReflectionType_GetResourceAccess(SlangReflection return ACCESS; \ } while(0) - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); CASE(HLSLStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ); CASE(HLSLRWStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); CASE(HLSLAppendStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_APPEND); @@ -419,11 +407,6 @@ SLANG_API SlangReflectionType* spReflectionType_GetResourceResultType(SlangRefle return convert(type->As<TYPE>()->elementType.Ptr()); \ } while(0) - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - CASE(HLSLBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWBufferType, SLANG_TEXTURE_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - // TODO: structured buffer needs to expose type layout! CASE(HLSLStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ); |