diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp index 5e63a7cfd6..b54f813dd3 100644 --- a/source/slang/slang-type-layout.cpp +++ b/source/slang/slang-type-layout.cpp @@ -4763,7 +4763,16 @@ static TypeLayoutResult _createTypeLayout(TypeLayoutContext& context, Type* type ptrLayout->addResourceUsage(info.kind, info.size); - const auto valueTypeLayout = _createTypeLayout(context, ptrType->getValueType()); + TypeLayoutResult valueTypeLayout; + if (context.rules != &kScalarLayoutRulesImpl_) + { + auto subContext = context.with(&kScalarLayoutRulesImpl_); + valueTypeLayout = _createTypeLayout(subContext, ptrType->getValueType()); + } + else + { + valueTypeLayout = _createTypeLayout(context, ptrType->getValueType()); + } ptrLayout->valueTypeLayout = valueTypeLayout.layout; diff --git a/tools/slang-unit-test/unit-test-ptr-layout.cpp b/tools/slang-unit-test/unit-test-ptr-layout.cpp new file mode 100644 index 0000000000..3eb8de10f9 --- /dev/null +++ b/tools/slang-unit-test/unit-test-ptr-layout.cpp @@ -0,0 +1,54 @@ +// unit-test-ptr-layout.cpp + +#include "slang-com-ptr.h" +#include "slang.h" +#include "unit-test/slang-unit-test.h" + +#include +#include + +using namespace Slang; + +SLANG_UNIT_TEST(pointerTypeLayout) +{ + const char* testSource = "struct TestStruct {" + " int3 member0;" + " float member1;" + "};"; + + ComPtr globalSession; + SLANG_CHECK(slang_createGlobalSession(SLANG_API_VERSION, globalSession.writeRef()) == SLANG_OK); + slang::TargetDesc targetDesc = {}; + targetDesc.format = SLANG_SPIRV; + targetDesc.profile = globalSession->findProfile("spirv_1_5"); + slang::SessionDesc sessionDesc = {}; + sessionDesc.targetCount = 1; + sessionDesc.targets = &targetDesc; + sessionDesc.compilerOptionEntryCount = 1; + slang::CompilerOptionEntry compilerOptionEntry = {}; + compilerOptionEntry.name = slang::CompilerOptionName::EmitSpirvViaGLSL; + compilerOptionEntry.value.kind = slang::CompilerOptionValueKind::Int; + compilerOptionEntry.value.intValue0 = 1; + sessionDesc.compilerOptionEntries = &compilerOptionEntry; + + ComPtr session; + SLANG_CHECK(globalSession->createSession(sessionDesc, session.writeRef()) == SLANG_OK); + + ComPtr diagnosticBlob; + auto module = + session->loadModuleFromSourceString("m", "m.slang", testSource, diagnosticBlob.writeRef()); + SLANG_CHECK(module != nullptr); + + + auto testBody = [&]() + { + auto reflection = module->getLayout(); + auto testStruct = reflection->findTypeByName("Ptr"); + auto ptrLayout = reflection->getTypeLayout(testStruct); + auto valueLayout = ptrLayout->getElementTypeLayout(); + SLANG_CHECK_ABORT(valueLayout->getFieldCount() == 2); + SLANG_CHECK_ABORT(valueLayout->getFieldByIndex(1)->getOffset() == 12); + }; + + testBody(); +}