From 120f97fb8d4e22b057cea43b503611f8292ade37 Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 10 Feb 2022 12:39:55 -0800 Subject: gfx: support shader record overwrite and fix QueryPool. (#2123) * Various fixes to gfx. * Fix. * Fixes. * Fix. * gfx: support root parameter via user-defined attribute. * Fix. * Fix. * Skip d3d12 tests on win x86. * Fixes. * gfx: support shader record overwrite. * Fix QueyPool implementation. * Rename to `getBindingRangeLeafVariable` Co-authored-by: Yong He --- source/slang/slang-reflection-api.cpp | 10 +++++----- source/slang/slang-type-layout.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 8bcab8ada..8919e2ba5 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -1559,7 +1559,7 @@ namespace Slang TypeLayout::ExtendedInfo::BindingRangeInfo bindingRange; bindingRange.leafTypeLayout = typeLayout; - bindingRange.variable = path.primary ? path.primary->var->getVariable() : nullptr; + bindingRange.leafVariable = path.primary ? path.primary->var->getVariable() : nullptr; bindingRange.bindingType = bindingType; bindingRange.count = multiplier; bindingRange.descriptorSetIndex = -1; @@ -1746,7 +1746,7 @@ namespace Slang // TypeLayout::ExtendedInfo::BindingRangeInfo bindingRange; bindingRange.leafTypeLayout = typeLayout; - bindingRange.variable = path.primary ? path.primary->var->getVariable() : nullptr; + bindingRange.leafVariable = path.primary ? path.primary->var->getVariable() : nullptr; bindingRange.bindingType = SLANG_BINDING_TYPE_EXISTENTIAL_VALUE; bindingRange.count = multiplier; bindingRange.descriptorSetIndex = 0; @@ -1819,7 +1819,7 @@ namespace Slang // TypeLayout::ExtendedInfo::BindingRangeInfo bindingRange; bindingRange.leafTypeLayout = typeLayout; - bindingRange.variable = path.primary ? path.primary->var->getVariable() : nullptr; + bindingRange.leafVariable = path.primary ? path.primary->var->getVariable() : nullptr; bindingRange.bindingType = bindingType; bindingRange.count = multiplier; bindingRange.descriptorSetIndex = 0; @@ -2019,7 +2019,7 @@ SLANG_API SlangReflectionTypeLayout* spReflectionTypeLayout_getBindingRangeLeafT return convert(bindingRange.leafTypeLayout); } -SLANG_API SlangReflectionVariable* spReflectionTypeLayout_getBindingRangeVariable( +SLANG_API SlangReflectionVariable* spReflectionTypeLayout_getBindingRangeLeafVariable( SlangReflectionTypeLayout* inTypeLayout, SlangInt index) { auto typeLayout = convert(inTypeLayout); @@ -2033,7 +2033,7 @@ SLANG_API SlangReflectionVariable* spReflectionTypeLayout_getBindingRangeVariabl return 0; auto& bindingRange = extTypeLayout->m_bindingRanges[index]; - return convert(bindingRange.variable); + return convert(bindingRange.leafVariable); } diff --git a/source/slang/slang-type-layout.h b/source/slang/slang-type-layout.h index d66a77365..6e28b6c9d 100644 --- a/source/slang/slang-type-layout.h +++ b/source/slang/slang-type-layout.h @@ -431,7 +431,7 @@ public: struct BindingRangeInfo { - VarDeclBase* variable; + VarDeclBase* leafVariable; TypeLayout* leafTypeLayout; SlangBindingType bindingType; LayoutSize count; -- cgit v1.2.3