Skip to content

Commit

Permalink
D3D12 Pixel History do not copy depth for non-raster events
Browse files Browse the repository at this point in the history 
This can be invalid i.e. a ClearRenderTarget() no guarantee what/if a depth target is bound
  • Loading branch information
@Zorro666
Zorro666 committed Nov 27, 2024
1 parent 9271dde commit a39c4cf
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 26 deletions.
91 changes: 66 additions & 25 deletions renderdoc/driver/d3d12/d3d12_pixelhistory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,15 @@ struct D3D12PixelHistoryCallback : public D3D12ActionCallback

void CopyImagePixel(ID3D12GraphicsCommandListX *cmd, D3D12CopyPixelParams &p, size_t offset)
{
D3D12_RESOURCE_DESC srcDesc = p.srcImage->GetDesc();
if((p.x < 0 || p.y < 0 || p.x >= srcDesc.Width || p.y >= srcDesc.Height))
{
// If the pixel is out of bounds, we can't read from the target image
RDCERR("Pixel is out of bounds %d,%d Dimensions %d x %d", p.x, p.y, srcDesc.Width,
srcDesc.Height);
return;
}

uint32_t baseMip = m_CallbackInfo.targetSubresource.mip;
bool copy3d = m_CallbackInfo.targetDesc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D;
uint32_t baseSlice = m_CallbackInfo.targetSubresource.slice;
Expand Down Expand Up @@ -990,15 +999,21 @@ struct D3D12OcclusionCallback : public D3D12PixelHistoryCallback
rdcarray<uint64_t> m_OcclusionResults;
};

struct EventInfo
{
D3D12_RESOURCE_STATES resourceState;
bool hasDepth;
};

struct D3D12ColorAndStencilCallback : public D3D12PixelHistoryCallback
{
D3D12ColorAndStencilCallback(WrappedID3D12Device *device, D3D12PixelHistoryShaderCache *shaderCache,
const D3D12PixelHistoryCallbackInfo &callbackInfo,
const rdcarray<uint32_t> &events,
std::map<uint32_t, D3D12_RESOURCE_STATES> resourceStates)
const std::map<uint32_t, EventInfo> &eventInfos)
: D3D12PixelHistoryCallback(device, shaderCache, callbackInfo, NULL),
m_Events(events),
m_ResourceStates(resourceStates)
m_EventInfos(eventInfos)
{
}

Expand Down Expand Up @@ -1178,7 +1193,9 @@ struct D3D12ColorAndStencilCallback : public D3D12PixelHistoryCallback
targetCopyParams.mip = m_CallbackInfo.targetSubresource.mip;
targetCopyParams.arraySlice = m_CallbackInfo.targetSubresource.slice;
targetCopyParams.multisampled = (m_CallbackInfo.targetDesc.SampleDesc.Count != 1);
D3D12_RESOURCE_STATES nonRtFallback = m_ResourceStates[eid];
const EventInfo &eventInfo = m_EventInfos.at(eid);
bool hasDepth = eventInfo.hasDepth;
D3D12_RESOURCE_STATES nonRtFallback = eventInfo.resourceState;
bool rtOutput = (nonRtFallback == D3D12_RESOURCE_STATE_RENDER_TARGET);
D3D12_RESOURCE_STATES fallback = D3D12_RESOURCE_STATE_RENDER_TARGET;

Expand Down Expand Up @@ -1218,6 +1235,10 @@ struct D3D12ColorAndStencilCallback : public D3D12PixelHistoryCallback
if(depthTarget)
return;

// return if the event does not have valid depth i.e. Clear, Copy, Dispatch
if(!hasDepth)
return;

// Get the bound depth format for this event
WrappedID3D12PipelineState *pipe =
m_pDevice->GetResourceManager()->GetCurrentAs<WrappedID3D12PipelineState>(m_SavedState.pipe);
Expand Down Expand Up @@ -1356,7 +1377,7 @@ struct D3D12ColorAndStencilCallback : public D3D12PixelHistoryCallback
D3D12RenderState m_SavedState;
std::map<ResourceId, D3D12PipelineReplacements> m_PipeCache;
rdcarray<uint32_t> m_Events;
std::map<uint32_t, D3D12_RESOURCE_STATES> m_ResourceStates;
const std::map<uint32_t, EventInfo> &m_EventInfos;
// Key is event ID, and value is an index of where the event data is stored.
std::map<uint32_t, size_t> m_EventIndices;
std::map<uint32_t, DXGI_FORMAT> m_DepthFormats;
Expand Down Expand Up @@ -2887,12 +2908,17 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
// to determine if these draws failed for some reason (for ex., depth test).
rdcarray<uint32_t> modEvents;
rdcarray<uint32_t> drawEvents;
std::map<uint32_t, D3D12_RESOURCE_STATES> resourceStates;
std::map<uint32_t, EventInfo> eventInfos;
for(size_t ev = 0; ev < events.size(); ev++)
{
ResourceUsage usage = events[ev].usage;
const uint32_t eventId = events[ev].eventId;
bool clear = (usage == ResourceUsage::Clear);
bool directWrite = IsDirectWrite(events[ev].usage);
bool directWrite = IsDirectWrite(usage);
EventInfo eventInfo = {};
const ActionDescription *action = m_pDevice->GetAction(eventId);
eventInfo.hasDepth =
(action->flags & (ActionFlags::MeshDispatch | ActionFlags::Drawcall)) ? true : false;

D3D12_RESOURCE_STATES resourceState = D3D12_RESOURCE_STATE_RENDER_TARGET;
if(IsUavWrite(usage))
Expand All @@ -2901,26 +2927,28 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
resourceState = D3D12_RESOURCE_STATE_RESOLVE_DEST;
else if(IsCopyWrite(usage))
resourceState = D3D12_RESOURCE_STATE_COPY_DEST;
resourceStates[events[ev].eventId] = resourceState;
eventInfo.resourceState = resourceState;

if(directWrite || clear)
{
modEvents.push_back(events[ev].eventId);
modEvents.push_back(eventId);
RDCASSERT(eventInfo.hasDepth == false);
}
else
{
uint64_t occlData = occlCb.GetOcclusionResult((uint32_t)events[ev].eventId);
uint64_t occlData = occlCb.GetOcclusionResult(eventId);
if(occlData > 0)
{
D3D12MarkerRegion::Set(m_pDevice->GetQueue()->GetReal(),
StringFormat::Fmt("%u has occl %llu", events[ev].eventId, occlData));
drawEvents.push_back(events[ev].eventId);
modEvents.push_back(events[ev].eventId);
StringFormat::Fmt("%u has occl %llu", eventId, occlData));
drawEvents.push_back(eventId);
modEvents.push_back(eventId);
}
}
eventInfos[eventId] = eventInfo;
}

D3D12ColorAndStencilCallback cb(m_pDevice, shaderCache, callbackInfo, modEvents, resourceStates);
D3D12ColorAndStencilCallback cb(m_pDevice, shaderCache, callbackInfo, modEvents, eventInfos);
{
D3D12MarkerRegion colorStencilRegion(m_pDevice->GetQueue()->GetReal(),
"D3D12ColorAndStencilCallback");
Expand Down Expand Up @@ -3034,22 +3062,35 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
FillInColor(fmt, ei.postmod, mod.postMod);
}

DXGI_FORMAT depthFormat = cb.GetDepthFormat(mod.eventId);
if(depthFormat != DXGI_FORMAT_UNKNOWN)
EventInfo eventInfo = eventInfos[eid];
bool hasDepth = eventInfo.hasDepth;

if(hasDepth)
{
mod.preMod.stencil = ei.premod.stencil;
mod.postMod.stencil = ei.postmod.stencil;
if(multisampled)
DXGI_FORMAT depthFormat = cb.GetDepthFormat(mod.eventId);
if(depthFormat != DXGI_FORMAT_UNKNOWN)
{
mod.preMod.depth = ei.premod.depth.fdepth;
mod.postMod.depth = ei.postmod.depth.fdepth;
}
else
{
mod.preMod.depth = GetDepthValue(depthFormat, ei.premod);
mod.postMod.depth = GetDepthValue(depthFormat, ei.postmod);
mod.preMod.stencil = ei.premod.stencil;
mod.postMod.stencil = ei.postmod.stencil;
if(multisampled)
{
mod.preMod.depth = ei.premod.depth.fdepth;
mod.postMod.depth = ei.postmod.depth.fdepth;
}
else
{
mod.preMod.depth = GetDepthValue(depthFormat, ei.premod);
mod.postMod.depth = GetDepthValue(depthFormat, ei.postmod);
}
}
}
else
{
mod.preMod.stencil = -1;
mod.preMod.depth = -1;
mod.postMod.stencil = -1;
mod.postMod.depth = -1;
}

int32_t frags = int32_t(ei.dsWithoutShaderDiscard[0]);
int32_t fragsClipped = int32_t(ei.dsWithShaderDiscard[0]);
Expand Down
5 changes: 4 additions & 1 deletion util/test/tests/D3D12/D3D12_Pixel_History.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ def depth_target_test(self, begin_name: str):
rdtest.log.print("Testing pixel {}, {}".format(x, y))
modifs: List[rd.PixelModification] = self.controller.PixelHistory(tex, x, y, sub, rt.format.compType)
events = [
[[event_id, begin_renderpass_eid], [passed, True], [get_post_mod_depth, 1.0]],
[[event_id, begin_renderpass_eid], [passed, True], [get_post_mod_depth, -1.0]],
[[event_id, background_eid], [passed, True], [primitive_id, 0], [get_pre_mod_depth, 1.0], [get_post_mod_depth, 0.95]],
[[event_id, test_eid], [passed, True], [depth_test_failed, False], [primitive_id, 0], [get_shader_out_depth, 0.5], [get_post_mod_depth, 0.5]],
[[event_id, test_eid], [passed, False], [depth_test_failed, True], [primitive_id, 1], [get_shader_out_depth, 0.6], [get_post_mod_depth, 0.5]],
Expand Down Expand Up @@ -549,6 +549,9 @@ def check_modifs_consistent(self, modifs):
if self.is_depth:
a = (modifs[i].postMod.depth, modifs[i].postMod.stencil)
b = (modifs[i + 1].preMod.depth, modifs[i + 1].preMod.stencil)
# ignore if postmod depth data is unknwon
if a[0] == -1 and a[1] == -1:
continue

if a != b:
raise rdtest.TestFailureException(
Expand Down

0 comments on commit a39c4cf

Please sign in to comment.