From 1b01ff909afa1eb6700c0dc947e679b9c3890880 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 27 Jun 2023 11:28:14 -0400 Subject: Pointer layout support (#2930) * WIP looking at reflection with pointers. * Added GetPointerLayout. * Initial test via reflection with layout of ptr type. * WIP handles ptrs to types that have layout that hasn't been completed. * Move tests to ptr. * WIP try to take into account lowering correctly between AggTypeDecl and Type, but doesn't quite work. * WIP a different path to handling recursive lowering problem with Ptr. * Fix issues with reflection output. * Small tidy. * Fix for infinite recursion issue. * Lower IRPointerTypeLayout * Working with generics. Has a hack to work around Layout around Ptr in IR. The reflection around the generic - the name isn't much use, it should probably have the generic parameters, but that would require getName to do something more sophisticated. * Fix issue around calling finishOuterGenerics to early. * Remove feature/ptr test. * Fix type legalization being an infinite loop with Ptr self referencing. * Disable the pointer self reference test because produces an infintie loop on emit. * Fixed comment based on review. * Fix for issue with emit and pointers causing infinite recursion. --- source/slang/slang-reflection-api.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source/slang/slang-reflection-api.cpp') diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 5d35c7eef..8ec0979e4 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -310,7 +310,7 @@ SLANG_API SlangTypeKind spReflectionType_GetKind(SlangReflectionType* inType) auto type = convert(inType); if(!type) return SLANG_TYPE_KIND_NONE; - // TODO(tfoley: Don't emit the same type more than once... + // TODO(tfoley): Don't emit the same type more than once... if (const auto basicType = as(type)) { @@ -360,6 +360,10 @@ SLANG_API SlangTypeKind spReflectionType_GetKind(SlangReflectionType* inType) { return SLANG_TYPE_KIND_FEEDBACK; } + else if (const auto ptrType = as(type)) + { + return SLANG_TYPE_KIND_POINTER; + } // TODO: need a better way to handle this stuff... #define CASE(TYPE) \ else if(as(type)) do { \ @@ -993,6 +997,10 @@ SLANG_API SlangReflectionTypeLayout* spReflectionTypeLayout_GetElementTypeLayout { return convert(matrixTypeLayout->elementTypeLayout); } + else if (auto ptrTypeLayout = as(typeLayout)) + { + return convert(ptrTypeLayout->valueTypeLayout.Ptr()); + } return nullptr; } -- cgit v1.2.3