From 57e875e8660193b7629a253710ddc823313f73c0 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Thu, 19 Dec 2024 18:04:19 +0000
Subject: [PATCH] Ignore any non DerivedType debug data when iterating type
 members

---
 renderdoc/driver/shaders/dxil/dxil_debug.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/renderdoc/driver/shaders/dxil/dxil_debug.cpp b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
index 82ba4f247..21265b6c0 100644
--- a/renderdoc/driver/shaders/dxil/dxil_debug.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_debug.cpp
@@ -6469,7 +6469,14 @@ const TypeData &Debugger::AddDebugType(const DXIL::Metadata *typeMD)
             {
               const Metadata *memberMD = elementsMD->children[i];
               const DXIL::DIBase *memberBase = memberMD->dwarf;
+              // Ignore member functions
+              if(memberBase->type == DXIL::DIBase::Subprogram)
+                continue;
               RDCASSERTEQUAL(memberBase->type, DXIL::DIBase::DerivedType);
+              // Ignore anything that isn't DIBase::DerivedType
+              if(memberBase->type != DXIL::DIBase::DerivedType)
+                continue;
+
               const DXIL::DIDerivedType *member = memberBase->As<DIDerivedType>();
               RDCASSERTEQUAL(member->tag, DXIL::DW_TAG_member);
               // const TypeData &memberType = AddDebugType(member->base);