summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/slang/slang-ast-type.cpp2
-rw-r--r--source/slang/slang-reflection-json.cpp5
2 files changed, 7 insertions, 0 deletions
diff --git a/source/slang/slang-ast-type.cpp b/source/slang/slang-ast-type.cpp
index 5056e5407..8a224b305 100644
--- a/source/slang/slang-ast-type.cpp
+++ b/source/slang/slang-ast-type.cpp
@@ -1118,6 +1118,8 @@ SlangResourceShape ResourceType::getShape()
baseShape = (SlangResourceShape)((uint32_t)baseShape | SLANG_TEXTURE_SHADOW_FLAG);
if (isFeedback())
baseShape = (SlangResourceShape)((uint32_t)baseShape | SLANG_TEXTURE_FEEDBACK_FLAG);
+ if (isCombined())
+ baseShape = (SlangResourceShape)((uint32_t)baseShape | SLANG_TEXTURE_COMBINED_FLAG);
return baseShape;
}
diff --git a/source/slang/slang-reflection-json.cpp b/source/slang/slang-reflection-json.cpp
index 72855a9b1..ee11b061a 100644
--- a/source/slang/slang-reflection-json.cpp
+++ b/source/slang/slang-reflection-json.cpp
@@ -496,6 +496,11 @@ static void emitReflectionResourceTypeBaseInfoJSON(
writer.maybeComma();
writer << "\"feedback\": true";
}
+ if (shape & SLANG_TEXTURE_COMBINED_FLAG)
+ {
+ writer.maybeComma();
+ writer << "\"combined\": true";
+ }
if (access != SLANG_RESOURCE_ACCESS_READ)
{