From 16986d105c5af4c4ef6f8f54df5c42ec5c357bb5 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Wed, 4 Oct 2017 10:51:12 -0600 Subject: [PATCH] Fix imageExtent to use correct destination size This fixes an issue with using imageParms to specify the imageExtent for the cases where the test has done scaling between the source and destination surfaces. VK-GL-CTS issue: 729 Affects: dEQP-VK.api.copy_and_blit.* Change-Id: I4053496dfa1fdedd9edb7e108e554cb988559bcf Components: Vulkan --- .../vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp index d1435e9..d446c66 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp @@ -656,7 +656,12 @@ void CopiesAndBlittingTestInstance::readImageAspect (vk::VkImage image, const deUint32 queueFamilyIndex = m_context.getUniversalQueueFamilyIndex(); const VkDeviceSize pixelDataSize = calculateSize(dst); - const VkExtent3D imageExtent = getExtent3D(imageParms); + const VkExtent3D imageExtent = + { + (deUint32)dst.getWidth(), + (deUint32)dst.getHeight(), + (imageParms.imageType == VK_IMAGE_TYPE_3D) ? (deUint32)dst.getDepth() : 1, + }; // Create destination buffer { -- 2.7.4