From a3ec188b1bae46d0390b71f88e931946c4ced187 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 6 Dec 2024 20:25:19 -0800
Subject: [PATCH 1/2] Fix reflection for pointer element types.

---
 source/slang/slang-type-layout.cpp            | 11 +++-
 .../slang-unit-test/unit-test-ptr-layout.cpp  | 54 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tools/slang-unit-test/unit-test-ptr-layout.cpp

diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index 5e63a7cfd6..644a64d857 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_)
+        {
+            valueTypeLayout =
+                _createTypeLayout(context.with(&kScalarLayoutRulesImpl_), 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 <stdio.h>
+#include <stdlib.h>
+
+using namespace Slang;
+
+SLANG_UNIT_TEST(pointerTypeLayout)
+{
+    const char* testSource = "struct TestStruct {"
+                             "   int3 member0;"
+                             "   float member1;"
+                             "};";
+
+    ComPtr<slang::IGlobalSession> 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<slang::ISession> session;
+    SLANG_CHECK(globalSession->createSession(sessionDesc, session.writeRef()) == SLANG_OK);
+
+    ComPtr<slang::IBlob> 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<TestStruct>");
+        auto ptrLayout = reflection->getTypeLayout(testStruct);
+        auto valueLayout = ptrLayout->getElementTypeLayout();
+        SLANG_CHECK_ABORT(valueLayout->getFieldCount() == 2);
+        SLANG_CHECK_ABORT(valueLayout->getFieldByIndex(1)->getOffset() == 12);
+    };
+
+    testBody();
+}

From e626da80d6f24a592d42a91172031a750edb1a2b Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Fri, 6 Dec 2024 20:30:34 -0800
Subject: [PATCH 2/2] Fix.

---
 source/slang/slang-type-layout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index 644a64d857..b54f813dd3 100644
--- a/source/slang/slang-type-layout.cpp
+++ b/source/slang/slang-type-layout.cpp
@@ -4766,8 +4766,8 @@ static TypeLayoutResult _createTypeLayout(TypeLayoutContext& context, Type* type
         TypeLayoutResult valueTypeLayout;
         if (context.rules != &kScalarLayoutRulesImpl_)
         {
-            valueTypeLayout =
-                _createTypeLayout(context.with(&kScalarLayoutRulesImpl_), ptrType->getValueType());
+            auto subContext = context.with(&kScalarLayoutRulesImpl_);
+            valueTypeLayout = _createTypeLayout(subContext, ptrType->getValueType());
         }
         else
         {