From d644ddcc643be8b30e70b7585a1d32c958e990a4 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Fri, 7 Jul 2017 08:37:39 -0700 Subject: Add some reflection support for SSBO and `tbuffer` declarations These are mostly copy-pasted from the existing `cbuffer` support, so there might be details I'm missing. --- slang.h | 6 +++++- source/slang/reflection.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/slang.h b/slang.h index 926ef531d..b6f35f255 100644 --- a/slang.h +++ b/slang.h @@ -358,7 +358,9 @@ extern "C" SLANG_TYPE_KIND_CONSTANT_BUFFER, SLANG_TYPE_KIND_RESOURCE, SLANG_TYPE_KIND_SAMPLER_STATE, - + SLANG_TYPE_KIND_TEXTURE_BUFFER, + SLANG_TYPE_KIND_SHADER_STORAGE_BUFFER, + SLANG_TYPE_KIND_COUNT, }; @@ -547,6 +549,8 @@ namespace slang ConstantBuffer = SLANG_TYPE_KIND_CONSTANT_BUFFER, Resource = SLANG_TYPE_KIND_RESOURCE, SamplerState = SLANG_TYPE_KIND_SAMPLER_STATE, + TextureBuffer = SLANG_TYPE_KIND_TEXTURE_BUFFER, + ShaderStorageBuffer = SLANG_TYPE_KIND_SHADER_STORAGE_BUFFER, }; enum ScalarType : SlangScalarType diff --git a/source/slang/reflection.cpp b/source/slang/reflection.cpp index b27cc0696..d62da70c1 100644 --- a/source/slang/reflection.cpp +++ b/source/slang/reflection.cpp @@ -100,6 +100,14 @@ SLANG_API SlangTypeKind spReflectionType_GetKind(SlangReflectionType* inType) { return SLANG_TYPE_KIND_CONSTANT_BUFFER; } + else if (type->As()) + { + return SLANG_TYPE_KIND_TEXTURE_BUFFER; + } + else if (type->As()) + { + return SLANG_TYPE_KIND_SHADER_STORAGE_BUFFER; + } else if (auto samplerStateType = type->As()) { return SLANG_TYPE_KIND_SAMPLER_STATE; @@ -1049,6 +1057,24 @@ static void emitReflectionTypeInfoJSON( type->getElementType()); break; + case SLANG_TYPE_KIND_TEXTURE_BUFFER: + write(writer, "\"kind\": \"textureBuffer\""); + write(writer, ",\n"); + write(writer, "\"elementType\": "); + emitReflectionTypeJSON( + writer, + type->getElementType()); + break; + + case SLANG_TYPE_KIND_SHADER_STORAGE_BUFFER: + write(writer, "\"kind\": \"shaderStorageBuffer\""); + write(writer, ",\n"); + write(writer, "\"elementType\": "); + emitReflectionTypeJSON( + writer, + type->getElementType()); + break; + case SLANG_TYPE_KIND_SCALAR: write(writer, "\"kind\": \"scalar\""); write(writer, ",\n"); @@ -1184,6 +1210,23 @@ static void emitReflectionTypeLayoutInfoJSON( typeLayout->getElementTypeLayout()); break; + case SLANG_TYPE_KIND_TEXTURE_BUFFER: + write(writer, "\"kind\": \"textureBuffer\""); + write(writer, ",\n"); + write(writer, "\"elementType\": "); + emitReflectionTypeLayoutJSON( + writer, + typeLayout->getElementTypeLayout()); + break; + + case SLANG_TYPE_KIND_SHADER_STORAGE_BUFFER: + write(writer, "\"kind\": \"shaderStorageBuffer\""); + write(writer, ",\n"); + write(writer, "\"elementType\": "); + emitReflectionTypeLayoutJSON( + writer, + typeLayout->getElementTypeLayout()); + break; } // TODO: emit size info for types -- cgit v1.2.3