Initialize resourceImgLayout before use for all code paths
authorPiers Daniell <pdaniell@nvidia.com>
Wed, 25 Nov 2020 20:13:57 +0000 (13:13 -0700)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Thu, 26 Nov 2020 16:48:25 +0000 (11:48 -0500)
Without this fix when updateDescriptorSet() is called in
BarrierTestInstance::iterate() debug builds for Vulkan CTS will
complain that resourceImgLayout is used without being initialized.

Affects:

dEQP-VK.ray_tracing_pipeline.barrier.*

Components: Vulkan

VK-GL-CTS issue: 2669

Change-Id: If320ac561cf278a9697ca33d302a1130db29fdb7

external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBarrierTests.cpp

index a1e88ae..9a7d2b3 100644 (file)
@@ -1250,7 +1250,7 @@ tcu::TestStatus BarrierTestInstance::iterate (void)
 
        std::unique_ptr<ImageWithMemory>        resourceImg;
        Move<VkImageView>                                       resourceImgView;
-       VkImageLayout                                           resourceImgLayout;
+       VkImageLayout                                           resourceImgLayout                       = VK_IMAGE_LAYOUT_UNDEFINED;
        const auto                                                      resourceImgSubresourceRange     = makeImageSubresourceRange(VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u);
        std::unique_ptr<BufferWithMemory>       stagingBuffer;
        std::unique_ptr<BufferWithMemory>       resourceBuffer;