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

Tidyup python logging in GL Pixel History

Browse Source
This commit is contained in:
Jake Turner
2023-12-31 07:34:10 +00:00
parent a70bed751b
commit 0171ee464a
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/tests/GL/GL_Pixel_History.py
+5 -13
View File
@@ -16,7 +16,7 @@ class GL_Pixel_History(rdtest.TestCase):
if action is None:
break
rdtest.log.success(f'Test {action.eventId} started.')
rdtest.log.success(f'Testing Event {action.eventId} started.')
self.controller.SetFrameEvent(action.eventId, True)
pipe: rd.PipeState = self.controller.GetPipelineState()
@@ -25,7 +25,7 @@ class GL_Pixel_History(rdtest.TestCase):
sub = rd.Subresource()
texDescription : rd.TextureDescription = self.get_texture(tex)
print(f"format: {texDescription.format.Name()}")
rdtest.log.print("Testing format {}".format(texDescription.format.Name()))
if texDescription.format.type == rd.ResourceFormatType.R5G5B5A1 or texDescription.format.type == rd.ResourceFormatType.R5G6B5:
eps = 1.0 / 32.0
@@ -38,9 +38,8 @@ class GL_Pixel_History(rdtest.TestCase):
else:
eps = 2.0 / 16384.0
x, y = 190, 149
rdtest.log.print("Testing pixel {}, {}".format(x, y))
events = [glclear.eventId, action.eventId]
modifs: List[rd.PixelModification] = self.controller.PixelHistory(tex, x, y, sub, rt.typeCast)
self.check_events(events, modifs, False)
@@ -48,29 +47,22 @@ class GL_Pixel_History(rdtest.TestCase):
self.check_shader_out_with_postmod(modifs[-1].shaderOut.col.floatValue, modifs[-1].postMod.col.floatValue, texDescription.format.compCount, eps)
x, y = 328, 199
rdtest.log.print("Testing pixel {}, {}".format(x, y))
events = [glclear.eventId]
modifs: List[rd.pixelModification] = self.controller.PixelHistory(tex, x, y, sub, rt.typeCast)
self.check_events(events, modifs, False)
self.check_pixel_value(tex, x, y, modifs[-1].postMod.col.floatValue, sub=sub, cast=rt.typeCast, eps=eps)
rdtest.log.success('Test {} completed.'.format(action.eventId))
rdtest.log.success('Testing Event {} completed.'.format(action.eventId))
def check_events(self, events, modifs, hasSecondary):
eventMatchingModifs = modifs[(-1 * len(events)):]
print(f"Events: {events}, Modifs: {modifs}, EventMatchingModifs: {eventMatchingModifs}")
# modifications can show results from previous colour passes which we don't care about for now, so we only check the last relevant modifs
for i in range(len(eventMatchingModifs)):
self.check(eventMatchingModifs[i].eventId == events[i], f"Expected event with id {events[i]}, but got {eventMatchingModifs[i].eventId}")
def check_shader_out_with_postmod(self, shaderOut, postMod, compCount: int, eps: float):
print(f"shaderOut: {shaderOut}, posMod: {postMod}")
diff = 0
for i in range(compCount):
if not rdtest.value_compare(shaderOut[i], postMod[i], eps=eps):
raise rdtest.TestFailureException(f"shaderOut and postMod differ by {shaderOut[i] - postMod[i]}")