diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp
index 68591729d..fdea09d70 100644
--- a/renderdoc/driver/d3d11/d3d11_analyse.cpp
+++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp
@@ -492,7 +492,7 @@ ShaderDebug::State D3D11DebugManager::CreateShaderDebugState(ShaderDebugTrace &t
 	return initialState;
 }
 
-void D3D11DebugManager::CreateShaderGlobalState(ShaderDebug::GlobalState &global, uint32_t UAVStartSlot, ID3D11UnorderedAccessView **UAVs, ID3D11ShaderResourceView **SRVs)
+void D3D11DebugManager::CreateShaderGlobalState(ShaderDebug::GlobalState &global, DXBC::DXBCFile *dxbc, uint32_t UAVStartSlot, ID3D11UnorderedAccessView **UAVs, ID3D11ShaderResourceView **SRVs)
 {
 	for(int i=0; UAVs != NULL && i+UAVStartSlot < D3D11_PS_CS_UAV_REGISTER_COUNT; i++)
 	{
@@ -591,6 +591,32 @@ void D3D11DebugManager::CreateShaderGlobalState(ShaderDebug::GlobalState &global
 			SAFE_RELEASE(res);
 		}
 	}
+
+	for(size_t i=0; i < dxbc->m_Declarations.size(); i++)
+	{
+		if(dxbc->m_Declarations[i].declaration == DXBC::OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_RAW ||
+		   dxbc->m_Declarations[i].declaration == DXBC::OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED)
+		{
+			uint32_t slot = (uint32_t)dxbc->m_Declarations[i].operand.indices[0].index;
+
+			if(global.groupshared.size() <= slot)
+			{
+				global.groupshared.resize(slot+1);
+
+				ShaderDebug::GlobalState::groupsharedMem &mem = global.groupshared[slot];
+
+				mem.structured = (dxbc->m_Declarations[i].declaration == DXBC::OPCODE_DCL_THREAD_GROUP_SHARED_MEMORY_STRUCTURED);
+
+				mem.count = dxbc->m_Declarations[i].count;
+				if(mem.structured)
+					mem.bytestride= dxbc->m_Declarations[i].stride;
+				else
+					mem.bytestride= 4; // raw groupshared is implicitly uint32s
+
+				mem.data.resize(mem.bytestride*mem.count);
+			}
+		}
+	}
 }
 		
 // struct that saves pointers as we iterate through to where we ultimately
@@ -691,7 +717,7 @@ ShaderDebugTrace D3D11DebugManager::DebugVertex(uint32_t frameID, uint32_t event
 	ShaderDebugTrace ret;
 	
 	GlobalState global;
-	CreateShaderGlobalState(global, 0, NULL, rs->VS.SRVs);
+	CreateShaderGlobalState(global, dxbc, 0, NULL, rs->VS.SRVs);
 	State initialState = CreateShaderDebugState(ret, -1, dxbc, cbufData);
 
 	for(int32_t i=0; i < ret.inputs.count; i++)
@@ -1233,7 +1259,7 @@ ShaderDebugTrace D3D11DebugManager::DebugPixel(uint32_t frameID, uint32_t eventI
 	ShaderDebugTrace traces[4];
 	
 	GlobalState global;
-	CreateShaderGlobalState(global, rs->OM.UAVStartSlot, rs->OM.UAVs, rs->PS.SRVs);
+	CreateShaderGlobalState(global, dxbc, rs->OM.UAVStartSlot, rs->OM.UAVs, rs->PS.SRVs);
 
 	{
 		DebugHit *hit = winner;
@@ -1396,7 +1422,7 @@ ShaderDebugTrace D3D11DebugManager::DebugThread(uint32_t frameID, uint32_t event
 	ShaderDebugTrace ret;
 		
 	GlobalState global;
-	CreateShaderGlobalState(global, 0, rs->CS.UAVs, rs->CS.SRVs);
+	CreateShaderGlobalState(global, dxbc, 0, rs->CS.UAVs, rs->CS.SRVs);
 	State initialState = CreateShaderDebugState(ret, -1, dxbc, cbufData);
 	
 	for(int i=0; i < 3; i++)
diff --git a/renderdoc/driver/d3d11/d3d11_debug.h b/renderdoc/driver/d3d11/d3d11_debug.h
index 555d8ef16..23c1c8e22 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.h
+++ b/renderdoc/driver/d3d11/d3d11_debug.h
@@ -489,7 +489,7 @@ class D3D11DebugManager
 		bool InitDebugRendering();
 
 		ShaderDebug::State CreateShaderDebugState(ShaderDebugTrace &trace, int quadIdx, DXBC::DXBCFile *dxbc, vector<byte> *cbufData);
-		void CreateShaderGlobalState(ShaderDebug::GlobalState &global, uint32_t UAVStartSlot, ID3D11UnorderedAccessView **UAVs, ID3D11ShaderResourceView **SRVs);
+		void CreateShaderGlobalState(ShaderDebug::GlobalState &global, DXBC::DXBCFile *dxbc, uint32_t UAVStartSlot, ID3D11UnorderedAccessView **UAVs, ID3D11ShaderResourceView **SRVs);
 		void FillCBufferVariables(const string &prefix, size_t &offset, bool flatten,
 								  const vector<DXBC::CBufferVariable> &invars, vector<ShaderVariable> &outvars,
 								  const vector<byte> &data);
diff --git a/renderdoc/driver/d3d11/shaders/dxbc_debug.h b/renderdoc/driver/d3d11/shaders/dxbc_debug.h
index 3bc2eb091..7248e5d7c 100644
--- a/renderdoc/driver/d3d11/shaders/dxbc_debug.h
+++ b/renderdoc/driver/d3d11/shaders/dxbc_debug.h
@@ -83,6 +83,17 @@ struct GlobalState
 
 			ViewFmt format;
 		} srvs[128];
+
+		struct groupsharedMem
+		{
+			bool structured;
+			uint32_t bytestride;
+			uint32_t count; // of structures (above stride), or uint32s (raw)
+
+			vector<byte> data;
+		};
+
+		vector<groupsharedMem> groupshared;
 };
 
 class State : public ShaderDebugState