diff options
| author | Phil Guo <phil@philguo.com> | 2019-03-13 09:01:25 -0700 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2019-03-13 09:01:25 -0700 |
| commit | 8fd57e2cefee6248f9daf46bbf112edb7d7b7d71 (patch) | |
| tree | 7afe3d3e8773f8db1e136060f1d9a4edfa7c693b | |
| parent | bf92b6c33ba9a797ba56a5abd73a850390a16473 (diff) | |
Add SLANG_ACCELERATION_STRUCTURE resource shape for RaytracingAccelerationStructureType (#901)
* Add SLANG_ACCELERATION_STRUCTURE resource shape for RaytracingAccelerationStructureType
* Change order of resource shape cases
I've changed the order of the `UNKNOWN` and `ACCELERATION_STRUCTURE` cases so that the binary value of the `UNKNOWN` case isn't changed by the new feature.
| -rw-r--r-- | slang.h | 1 | ||||
| -rw-r--r-- | source/slang/reflection.cpp | 19 |
2 files changed, 11 insertions, 9 deletions
@@ -1535,6 +1535,7 @@ extern "C" SLANG_STRUCTURED_BUFFER = 0x06, SLANG_BYTE_ADDRESS_BUFFER = 0x07, SLANG_RESOURCE_UNKNOWN = 0x08, + SLANG_ACCELERATION_STRUCTURE = 0x09, SLANG_RESOURCE_EXT_SHAPE_MASK = 0xF0, SLANG_TEXTURE_ARRAY_FLAG = 0x40, diff --git a/source/slang/reflection.cpp b/source/slang/reflection.cpp index 3b3306084..9c33ca9d3 100644 --- a/source/slang/reflection.cpp +++ b/source/slang/reflection.cpp @@ -511,15 +511,16 @@ SLANG_API SlangResourceShape spReflectionType_GetResourceShape(SlangReflectionTy return SHAPE; \ } while(0) - CASE(HLSLStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - CASE(HLSLRasterizerOrderedStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_RASTER_ORDERED); - CASE(HLSLAppendStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_APPEND); - CASE(HLSLConsumeStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_CONSUME); - CASE(HLSLByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ); - CASE(HLSLRWByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); - CASE(HLSLRasterizerOrderedByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_RASTER_ORDERED); - CASE(UntypedBufferResourceType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ); + CASE(HLSLStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ); + CASE(HLSLRWStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); + CASE(HLSLRasterizerOrderedStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_RASTER_ORDERED); + CASE(HLSLAppendStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_APPEND); + CASE(HLSLConsumeStructuredBufferType, SLANG_STRUCTURED_BUFFER, SLANG_RESOURCE_ACCESS_CONSUME); + CASE(HLSLByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ); + CASE(HLSLRWByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ_WRITE); + CASE(HLSLRasterizerOrderedByteAddressBufferType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_RASTER_ORDERED); + CASE(RaytracingAccelerationStructureType, SLANG_ACCELERATION_STRUCTURE, SLANG_RESOURCE_ACCESS_READ); + CASE(UntypedBufferResourceType, SLANG_BYTE_ADDRESS_BUFFER, SLANG_RESOURCE_ACCESS_READ); #undef CASE return SLANG_RESOURCE_NONE; |