From ee29316060b9858e85c5aabb2a6c563c6d34826a Mon Sep 17 00:00:00 2001 From: Arkadiusz Sarwa Date: Tue, 19 Apr 2016 09:24:23 +0200 Subject: [PATCH] Bug Fix: Corrected barrier in the tests dEQP-VK.ubo --- .../modules/vulkan/ubo/vktUniformBlockCase.cpp | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp index 2bde968..0313e56 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp @@ -1462,6 +1462,34 @@ tcu::TestStatus UniformBlockCaseInstance::iterate (void) &clearValue, // const VkClearValue* pClearValues; }; + // Add barrier for initializing image state + { + const vk::VkImageMemoryBarrier initializeBarrier = + { + vk::VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER, // VkStructureType sType; + DE_NULL, // const void* pNext + 0, // VVkAccessFlags srcAccessMask; + vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, // VkAccessFlags dstAccessMask; + vk::VK_IMAGE_LAYOUT_UNDEFINED, // VkImageLayout oldLayout; + vk::VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, // VkImageLayout newLayout; + queueFamilyIndex, // deUint32 srcQueueFamilyIndex; + queueFamilyIndex, // deUint32 dstQueueFamilyIndex; + *colorImage, // VkImage image; + { + vk::VK_IMAGE_ASPECT_COLOR_BIT, // VkImageAspectFlags aspectMask; + 0u, // deUint32 baseMipLevel; + 1u, // deUint32 mipLevels; + 0u, // deUint32 baseArraySlice; + 1u, // deUint32 arraySize; + } // VkImageSubresourceRange subresourceRange + }; + + vk.cmdPipelineBarrier(*cmdBuffer, vk::VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, vk::VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, (vk::VkDependencyFlags)0, + 0, (const vk::VkMemoryBarrier*)DE_NULL, + 0, (const vk::VkBufferMemoryBarrier*)DE_NULL, + 1, &initializeBarrier); + } + vk.cmdBeginRenderPass(*cmdBuffer, &passBeginInfo, vk::VK_SUBPASS_CONTENTS_INLINE); vk.cmdBindPipeline(*cmdBuffer, vk::VK_PIPELINE_BIND_POINT_GRAPHICS, *pipeline); -- 2.7.4