mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-09-24 06:36:08 +00:00
Update VK_Image_Layouts test to check preinitialised data also
This commit is contained in:
@@ -47,9 +47,12 @@ class VK_Image_Layouts(rdtest.TestCase):
|
||||
if res.name == "Image:Preinitialised":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_PREINITIALIZED":
|
||||
raise rdtest.TestFailureException("Pre-initialised image is in {} layout".format(img.layouts[0].name))
|
||||
# check the preinitialised image has the right data
|
||||
self.check_pixel_value(img.resourceId, 0, 0, [0.25, 0.25, 0.25, 0.25], eps=0.01)
|
||||
elif res.name == "Image:Undefined":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_UNDEFINED":
|
||||
raise rdtest.TestFailureException("Undefined image is in {} layout".format(img.layouts[0].name))
|
||||
# don't check undefined image contents
|
||||
elif res.name == "Image:Swapchain":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_PRESENT_SRC_KHR":
|
||||
raise rdtest.TestFailureException("Swapchain image is in {} layout".format(img.layouts[0].name))
|
||||
@@ -69,9 +72,46 @@ class VK_Image_Layouts(rdtest.TestCase):
|
||||
if res.name == "Image:Preinitialised":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL":
|
||||
raise rdtest.TestFailureException("Pre-initialised image is in {} layout".format(img.layouts[0].name))
|
||||
# check the preinitialised image has the right data
|
||||
self.check_pixel_value(img.resourceId, 0, 0, [0.25, 0.25, 0.25, 0.25], eps=0.01)
|
||||
elif res.name == "Image:Undefined":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL":
|
||||
raise rdtest.TestFailureException("Undefined image is in {} layout".format(img.layouts[0].name))
|
||||
# check the preinitialised image data was copied correctly to the previously undefined image
|
||||
self.check_pixel_value(img.resourceId, 0, 0, [0.25, 0.25, 0.25, 0.25], eps=0.01)
|
||||
elif img.resourceId == pipe.currentPass.framebuffer.attachments[0].resource:
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_GENERAL":
|
||||
raise rdtest.TestFailureException("Rendered swapchain image is in {} layout".format(img.layouts[0].name))
|
||||
|
||||
action = self.find_action("Preinit clear")
|
||||
|
||||
self.check(action is not None)
|
||||
|
||||
self.controller.SetFrameEvent(action.eventId+1, False)
|
||||
|
||||
pipe: rd.VKState = self.controller.GetVulkanPipelineState()
|
||||
|
||||
# check that the pre-initialised image has transitioned + been cleared
|
||||
for img in pipe.images:
|
||||
img: rd.VKImageData
|
||||
res = self.get_resource(img.resourceId)
|
||||
if res.name == "Image:Preinitialised":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_GENERAL":
|
||||
raise rdtest.TestFailureException("Pre-initialised image is in {} layout".format(img.layouts[0].name))
|
||||
# check the preinitialised image has the right data
|
||||
self.check_pixel_value(img.resourceId, 0, 0, [0.8, 0.8, 0.8, 1.0], eps=0.01)
|
||||
|
||||
# finally check that it has reset to the correct value back at the start of the frame
|
||||
self.controller.SetFrameEvent(1, False)
|
||||
|
||||
pipe: rd.VKState = self.controller.GetVulkanPipelineState()
|
||||
|
||||
for img in pipe.images:
|
||||
img: rd.VKImageData
|
||||
res = self.get_resource(img.resourceId)
|
||||
if res.name == "Image:Preinitialised":
|
||||
if img.layouts[0].name != "VK_IMAGE_LAYOUT_PREINITIALIZED":
|
||||
raise rdtest.TestFailureException("Pre-initialised image is in {} layout".format(img.layouts[0].name))
|
||||
# check the preinitialised image has the right data
|
||||
self.check_pixel_value(img.resourceId, 0, 0, [0.25, 0.25, 0.25, 0.25], eps=0.01)
|
||||
|
||||
Reference in New Issue
Block a user