lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-22 06:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make Pointer a full VarType instead of a ShaderVariable member

Browse Source
This commit is contained in:
baldurk
2020-04-09 18:36:12 +01:00
parent c3d53237f7
commit 73c05536e0
11 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+4 -5
View File
@@ -587,9 +587,8 @@ ShaderVariable Debugger::MakePointerVariable(Id id, const ShaderVariable *v, uin
{
ShaderVariable var;
var.rows = var.columns = 1;
var.type = VarType::ULong;
var.type = VarType::GPUPointer;
var.name = GetRawName(id);
var.isPointer = true;
// encode the pointer into the first u64v
var.value.u64v[0] = (uint64_t)(uintptr_t)v;
@@ -608,7 +607,7 @@ ShaderVariable Debugger::MakeCompositePointer(const ShaderVariable &base, Id id,
// if the base is a plain value, we just start walking down the chain. If the base is a pointer
// though, we want to step down the chain in the underlying storage, so dereference first.
if(base.isPointer)
if(base.type == VarType::GPUPointer)
leaf = (const ShaderVariable *)(uintptr_t)base.value.u64v[0];
// first walk any struct member/array indices
@@ -638,7 +637,7 @@ ShaderVariable Debugger::MakeCompositePointer(const ShaderVariable &base, Id id,
ShaderVariable Debugger::EvaluatePointerVariable(const ShaderVariable &ptr) const
{
if(!ptr.isPointer)
if(ptr.type != VarType::GPUPointer)
return ptr;
ShaderVariable ret;
@@ -706,7 +705,7 @@ ShaderVariable Debugger::EvaluatePointerVariable(const ShaderVariable &ptr) cons
Id Debugger::GetPointerBaseId(const ShaderVariable &ptr) const
{
RDCASSERT(ptr.isPointer);
RDCASSERT(ptr.type == VarType::GPUPointer);
// we stored the base ID in [4] so that it's always available regardless of access chains
return Id::fromWord(ptr.value.uv[4]);