Skip to content

Commit

Permalink
Add format name to overlay test python logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Zorro666 committed Sep 10, 2023
1 parent 78a64f8 commit ecb96f3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions util/test/rdtest/shared/Overlay_Test.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,12 @@ def check_capture(self, base_event=0):
self.check_pixel_value(overlay_id, 200, 79, [3.0, 3.0, 3.0, 1.0], eps=eps)
self.check_pixel_value(overlay_id, 200, 93, [1.33, 1.33, 1.33, 1.0], eps=eps)

rdtest.log.success("Picked pixels are as expected for {}".format(str(overlay)))
rdtest.log.success("Picked pixels are as expected for {} Format {}".format(str(overlay), fmt))

if is_msaa:
rdtest.log.success("All MSAA overlays are as expected")
rdtest.log.success("All MSAA overlays are as expected Format {}".format(fmt))
else:
rdtest.log.success("All normal overlays are as expected")
rdtest.log.success("All normal overlays are as expected Format {}".format(fmt))

# Check the viewport overlay especially
view_marker: rd.ActionDescription = self.find_action("Viewport Test " + fmt, base_event)
Expand Down Expand Up @@ -520,9 +520,9 @@ def check_capture(self, base_event=0):
self.check_pixel_value(overlay_id, 200, 270, [43072.0, 43072.0, 43072.0, 1.0], eps=eps)
self.check_pixel_value(overlay_id, 200, 280, [0.0, 0.0, 0.0, 0.0], eps=eps)

rdtest.log.success("Picked pixels are as expected for {}".format(str(overlay)))
rdtest.log.success("Picked pixels are as expected for {} Format {}".format(str(overlay), fmt))

rdtest.log.success("Overlays are as expected around viewport/scissor behaviour")
rdtest.log.success("Overlays are as expected around viewport/scissor behaviour Format {}".format(fmt))

# Check the sample mask test
mask_marker: rd.ActionDescription = self.find_action("Sample Mask Test " + fmt, base_event)
Expand Down Expand Up @@ -596,7 +596,7 @@ def check_capture(self, base_event=0):
self.check_pixel_value(depth_tex, 250, 250, [0.95, 0.0, 0.0, 1.0], eps=eps)
self.check_pixel_value(depth_tex, 50, 50, [1.0, 0.0, 0.0, 1.0], eps=eps)

rdtest.log.success("Colour and depth at end are correct")
rdtest.log.success("Colour and depth at end are correct Format {}".format(fmt))

# Check clear before pass
tex.resourceId = col_tex
Expand Down Expand Up @@ -640,7 +640,7 @@ def check_capture(self, base_event=0):
self.check_pixel_value(depth_tex, 250, 250, [0.95, 0.0, 0.0, 1.0], eps=eps)
self.check_pixel_value(depth_tex, 50, 50, [1.0, 0.0, 0.0, 1.0], eps=eps)

rdtest.log.success("Clear before pass colour and depth values as expected")
rdtest.log.success("Clear before pass colour and depth values as expected Format {}".format(fmt))

# Check clear before action
tex.resourceId = col_tex
Expand Down Expand Up @@ -684,7 +684,7 @@ def check_capture(self, base_event=0):
self.check_pixel_value(depth_tex, 250, 250, [1.0, 0.0, 0.0, 1.0], eps=eps)
self.check_pixel_value(depth_tex, 50, 50, [1.0, 0.0, 0.0, 1.0], eps=eps)

rdtest.log.success("Clear before action colour and depth values as expected")
rdtest.log.success("Clear before action colour and depth values as expected Format {}".format(fmt))

rdtest.log.success("All overlays as expected for main action Format {}".format(fmt))

Expand Down

0 comments on commit ecb96f3

Please sign in to comment.