commit 153a537a3f87413ce262bf269d1ef1542e9a5186
author Ben Clayton <bclayton@google.com> Tue Jan 28 13:40:02 2020 +0000
committer Ben Clayton <bclayton@google.com> Tue Jan 28 16:19:47 2020 +0000
tree 8df6beced160bfd2141bcf1ac95dca8146d14593
parent 34e16df059f8c69f0409e167b4d2e7ef59bf7b55

SpirvShaderDebugger: Fix double nesting of struct members

See b/148445528 for more information.

Fixes: b/148445528
Change-Id: I0740a5b0ce18db4c3ef0a55a9c679e1b64395b46
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/40536
Tested-by: Ben Clayton <bclayton@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>

src/Pipeline/SpirvShaderDebugger.cpp

diff --git a/src/Pipeline/SpirvShaderDebugger.cpp b/src/Pipeline/SpirvShaderDebugger.cpp
index 9b4ce13..b3ae805 100644
--- a/src/Pipeline/SpirvShaderDebugger.cpp
+++ b/src/Pipeline/SpirvShaderDebugger.cpp
@@ -1141,8 +1141,7 @@
 
 			for(auto member : ty->members)
 			{
-				auto memberGroup = objectGroup.template group<const char *>(member->name.c_str());
-				exposeVariable(shader, memberGroup, l, member->name.c_str(), member->type, id, state, member->offset / 32);
+				exposeVariable(shader, objectGroup, l, member->name.c_str(), member->type, id, state, member->offset / 32);
 			}
 
 			return;