lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extend D3D12 Pixel History tests

Browse Source 
Check the post mod stencil at pixel location 110,100
Check the post mod stencil is unknown at pixel location 275, 260 for fragment zero of a multi-fragment event

Validate that in a fragment event the postMod stencil value should be unknown (-1 or -2)
This test validates the code change in 4815adaa83
This commit is contained in:
Jake Turner
2023-12-29 19:28:30 +00:00
parent baa5999582
commit a70bed751b
2 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/d3d12/d3d12_pixel_history.cpp
+3
View File
@@ -457,6 +457,7 @@ float4 main(v2f vertIn, uint primId : SV_PrimitiveID, uint sampleId : SV_SampleI
depthState.StencilEnable = FALSE;
pass.backgroundPipe = baselinePSO;
depthState.StencilEnable = TRUE;
pass.noPsPipe = baselinePSO.PS(NULL);
depthState.StencilEnable = TRUE;
@@ -564,8 +565,10 @@ float4 main(v2f vertIn, uint primId : SV_PrimitiveID, uint sampleId : SV_SampleI
cmd->DrawInstanced(3, 1, 0, 0);
setMarker(cmd, "Unbound Fragment Shader");
cmd->OMSetStencilRef(0x33);
cmd->SetPipelineState(pass.noPsPipe);
cmd->DrawInstanced(3, 1, 3, 0);
cmd->OMSetStencilRef(0x55);
setMarker(cmd, "Stencil Write");
cmd->SetPipelineState(pass.stencilWritePipe);
util/test/tests/D3D12/D3D12_Pixel_History.py
+44 -4
View File
@@ -14,15 +14,18 @@ def scissor_clipped(x): return x.scissorClipped
def stencil_test_failed(x): return x.stencilTestFailed
def shader_discarded(x): return x.shaderDiscarded
def get_shader_out_color(x): return x.shaderOut.col.floatValue
def get_shader_out_color(x): return value_selector(x.shaderOut.col)
def get_shader_out_depth(x): return x.shaderOut.depth
def get_pre_mod_color(x): return x.preMod.col.floatValue
def get_pre_mod_color(x): return value_selector(x.preMod.col)
def get_pre_mod_depth(x): return x.preMod.depth
def get_post_mod_color(x): return x.postMod.col.floatValue
def get_post_mod_color(x): return value_selector(x.postMod.col)
def get_post_mod_depth(x): return x.postMod.depth
def get_post_mod_stencil(x): return x.postMod.stencil
def unknown_post_mod_stencil(x): return x.postMod.stencil == -1 or x.postMod.stencil == -2
def unknown_stencil(x): return x == -1 or x == -2
def primitive_id(x): return x.primitiveID
def unboundPS(x): return x.unboundPS
@@ -94,6 +97,18 @@ class D3D12_Pixel_History(rdtest.TestCase):
depth_bounds_prep_eid = self.find_action("Depth Bounds Prep", begin_renderpass_eid).next.eventId
depth_bounds_clip_eid = self.find_action("Depth Bounds Clip", begin_renderpass_eid).next.eventId
# For pixel 110, 100, inside the red triangle with stencil value 0x55
x, y = 110, 100
rdtest.log.print("Testing pixel {}, {}".format(x, y))
modifs: List[rd.PixelModification] = self.controller.PixelHistory(tex, x, y, sub, rt.typeCast)
events = [
[[event_id, begin_renderpass_eid], [passed, True]],
[[event_id, unbound_fs_eid], [passed, True], [unboundPS, True], [primitive_id, 0], [get_post_mod_stencil, 0x33]],
[[event_id, stencil_write_eid], [passed, True], [primitive_id, 0], [get_post_mod_stencil, 0x55]],
]
self.check_events(events, modifs, False)
self.check_pixel_value(tex, x, y, value_selector(modifs[-1].postMod.col), sub=sub, cast=rt.typeCast)
# For pixel 190, 149 inside the red triangle
x, y = 190, 149
rdtest.log.print("Testing pixel {}, {}".format(x, y))
@@ -227,7 +242,7 @@ class D3D12_Pixel_History(rdtest.TestCase):
[[event_id, background_eid], [passed, True]],
[[event_id, depth_test_eid], [primitive_id, 0], [depth_test_failed, True],
[get_shader_out_color, (1.0, 1.0, 1.0, 2.75)], [get_shader_out_depth, 0.97], [get_post_mod_color, (1.0, 0.0, 1.0, 1.0)],
[get_post_mod_depth, 0.95]],
[get_post_mod_depth, 0.95], [unknown_post_mod_stencil, True]],
[[event_id, depth_test_eid], [primitive_id, 1], [depth_test_failed, False],
[get_shader_out_color, (1.0, 1.0, 0.0, 2.75)], [get_shader_out_depth, 0.20], [get_post_mod_color, (1.0, 1.0, 0.0, 1.0)],
[get_post_mod_depth, 0.20]],
@@ -407,6 +422,8 @@ class D3D12_Pixel_History(rdtest.TestCase):
if tex_details.mips > 1:
sub.mip = rt.firstMip
stencil_write_eid = self.find_action("Stencil Write", begin_renderpass_eid).next.eventId
unbound_fs_eid = self.find_action("Unbound Fragment Shader", begin_renderpass_eid).next.eventId
background_eid = self.find_action("Background", begin_renderpass_eid).next.eventId
test_eid = self.find_action("Test Begin", begin_renderpass_eid).next.eventId
@@ -421,6 +438,17 @@ class D3D12_Pixel_History(rdtest.TestCase):
]
self.check_events(events, modifs, False)
# For pixel 110, 100, inside the red triangle with stencil value 0x55
x, y = 110, 100
rdtest.log.print("Testing pixel {}, {}".format(x, y))
modifs: List[rd.PixelModification] = self.controller.PixelHistory(tex, x, y, sub, rt.typeCast)
events = [
[[event_id, begin_renderpass_eid], [passed, True]],
[[event_id, unbound_fs_eid], [passed, True], [unboundPS, True], [primitive_id, 0], [get_post_mod_stencil, 0x33]],
[[event_id, stencil_write_eid], [passed, True], [primitive_id, 0], [get_post_mod_stencil, 0x55]],
]
self.check_events(events, modifs, False)
def check_events(self, events, modifs, hasSecondary):
self.check(len(modifs) == len(events), "Expected {} events, got {}".format(len(events), len(modifs)))
# Check for consistency first. For secondary command buffers,
@@ -444,6 +472,14 @@ class D3D12_Pixel_History(rdtest.TestCase):
a = get_post_mod_color(modifs[i])
b = get_pre_mod_color(modifs[i + 1])
# A fragment event : postMod.stencil should be unknown
if modifs[i].eventId == modifs[i+1].eventId:
if not unknown_stencil(modifs[i].postMod.stencil):
raise rdtest.TestFailureException(
"postmod stencil at {} primitive {}: {} is not unknown".format(modifs[i].eventId,
modifs[i].primitiveID,
modifs[i].postMod.stencil))
if self.is_depth:
a = (modifs[i].postMod.depth, modifs[i].postMod.stencil)
b = (modifs[i + 1].preMod.depth, modifs[i + 1].preMod.stencil)
@@ -467,6 +503,10 @@ class D3D12_Pixel_History(rdtest.TestCase):
a = (modifs[i].preMod.depth, modifs[i].preMod.stencil)
b = (modifs[i].postMod.depth, modifs[i].postMod.stencil)
if a[1] == -2 or b[2] == -2:
a = (a[0], -2)
b = (b[0], -2)
if not rdtest.value_compare(a, b):
raise rdtest.TestFailureException(
"postmod at {} primitive {}: {} doesn't match premod: {}".format(modifs[i].eventId,