diff --git a/qrenderdoc/Windows/PixelHistoryView.cpp b/qrenderdoc/Windows/PixelHistoryView.cpp index b6c920e4f..548cd6fda 100644 --- a/qrenderdoc/Windows/PixelHistoryView.cpp +++ b/qrenderdoc/Windows/PixelHistoryView.cpp @@ -231,7 +231,7 @@ public: bool passed = true; bool uavnowrite = false; - if(mods.front().uavWrite) + if(mods.front().directShaderWrite) { ret += tr("EID %1\n%2\nBound as UAV or copy - potential modification") .arg(mods.front().eventID) @@ -265,7 +265,7 @@ public: { const PixelModification &mod = getMod(index); - if(mod.uavWrite) + if(mod.directShaderWrite) { QString ret = tr("Potential UAV/Copy write"); @@ -303,7 +303,7 @@ public: const PixelModification &mod = getMod(index); if(mod.unboundPS) return tr("No Pixel\nShader\nBound"); - if(mod.uavWrite) + if(mod.directShaderWrite) return tr("Tex Before\n\n") + modString(mod.preMod); return tr("Shader Out\n\n") + modString(mod.shaderOut); } @@ -350,7 +350,7 @@ public: for(const PixelModification &m : mods) passed |= m.passed(); - if(mods[0].uavWrite && + if(mods[0].directShaderWrite && memcmp(mods[0].preMod.col.value_u, mods[0].postMod.col.value_u, sizeof(uint32_t) * 4) == 0) return QBrush(QColor::fromRgb(235, 235, 235)); @@ -378,7 +378,7 @@ public: const PixelModification &mod = getMod(index); tag.eventID = mod.eventID; - if(!mod.uavWrite) + if(!mod.directShaderWrite) tag.primitive = mod.primitiveID; } diff --git a/renderdoc/api/replay/data_types.h b/renderdoc/api/replay/data_types.h index 5ec468212..74431395f 100644 --- a/renderdoc/api/replay/data_types.h +++ b/renderdoc/api/replay/data_types.h @@ -486,7 +486,7 @@ struct PixelModification { uint32_t eventID; - bool32 uavWrite; + bool32 directShaderWrite; bool32 unboundPS; uint32_t fragIndex; diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp index 704de9d15..37a848464 100644 --- a/renderdoc/core/replay_proxy.cpp +++ b/renderdoc/core/replay_proxy.cpp @@ -1621,7 +1621,7 @@ void Serialiser::Serialise(const char *name, PixelModification &el) { Serialise("", el.eventID); - Serialise("", el.uavWrite); + Serialise("", el.directShaderWrite); Serialise("", el.unboundPS); Serialise("", el.fragIndex); diff --git a/renderdoc/driver/d3d11/d3d11_analyse.cpp b/renderdoc/driver/d3d11/d3d11_analyse.cpp index 5183eb5c6..44592fcc1 100644 --- a/renderdoc/driver/d3d11/d3d11_analyse.cpp +++ b/renderdoc/driver/d3d11/d3d11_analyse.cpp @@ -5878,7 +5878,7 @@ vector D3D11DebugManager::PixelHistory(vector eve mod.eventID = events[i].eventID; - mod.uavWrite = uavWrite; + mod.directShaderWrite = uavWrite; mod.unboundPS = false; mod.preMod.col.value_u[0] = (uint32_t)i;