Fix Android WSI shared presentable image tests

The pipeline for Android WSI shared presentable image tests was not
provided with a valid scissor rect. This caused the tests to perform
incorrectly (and violates Vulkan requirements).

Affects:

dEQP-VK.wsi.android.shared_presentable_image.scale_down.demand
dEQP-VK.wsi.android.shared_presentable_image.scale_down.continuous

VK-GL-CTS Issue: 1857

Change-Id: I060c12d7192945ecbe01dfcc8e89c03874b9b218
Components: Vulkan, AOSP

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp
index 631cbf0..545f094 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSharedPresentableImageTests.cpp
@@ -498,7 +498,7 @@ vk::Move<vk::VkPipeline> createPipeline (const vk::DeviceInterface& vkd,
                DE_NULL
        };
        const std::vector<vk::VkViewport>                               viewports                       (1, vk::makeViewport(tcu::UVec2(width, height)));
-       const std::vector<vk::VkRect2D>                                 noScissors;
+       const std::vector<vk::VkRect2D>                                 scissors                        (1, vk::makeRect2D(tcu::UVec2(width, height)));
 
        return vk::makeGraphicsPipeline(vkd,                                                                            // const DeviceInterface&                        vk
                                                                        device,                                                                         // const VkDevice                                device
@@ -510,7 +510,7 @@ vk::Move<vk::VkPipeline> createPipeline (const vk::DeviceInterface& vkd,
                                                                        fragmentShaderModule,                                           // const VkShaderModule                          fragmentShaderModule
                                                                        renderPass,                                                                     // const VkRenderPass                            renderPass
                                                                        viewports,                                                                      // const std::vector<VkViewport>&                viewports
-                                                                       noScissors,                                                                     // const std::vector<VkRect2D>&                  scissors
+                                                                       scissors,                                                                       // const std::vector<VkRect2D>&                  scissors
                                                                        vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,        // const VkPrimitiveTopology                     topology
                                                                        0u,                                                                                     // const deUint32                                subpass
                                                                        0u,                                                                                     // const deUint32                                patchControlPoints