Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / shaderexecutor / vktOpaqueTypeIndexingTests.cpp

diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
index bf0f17a..05ecfd1 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
@@ -572,32 +572,17 @@ TestImage::TestImage (Context& context, TextureType texType, tcu::TextureFormat
                deMemcpy((deUint8*)alloc->getHostPtr() + ndx*pixelSize, colorValue, pixelSize);
 
        {
-               const VkCommandPoolCreateInfo           cmdPoolInfo             =
-               {
-                       VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
-                       DE_NULL,
-                       (VkCommandPoolCreateFlags)VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,
-                       context.getUniversalQueueFamilyIndex(),
-               };
-               const Unique<VkCommandPool>                     cmdPool                 (createCommandPool(vkd, device, &cmdPoolInfo));
-               const VkCommandBufferAllocateInfo       allocInfo               =
-               {
-                       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO,
-                       DE_NULL,
-                       *cmdPool,
-                       VK_COMMAND_BUFFER_LEVEL_PRIMARY,
-                       1u,
-               };
-               const Unique<VkCommandBuffer>           cmdBuf                  (allocateCommandBuffer(vkd, device, &allocInfo));
-               const VkCommandBufferBeginInfo          beginInfo               =
+               const Unique<VkCommandPool>             cmdPool                 (createCommandPool(vkd, device, VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT, context.getUniversalQueueFamilyIndex()));
+               const Unique<VkCommandBuffer>   cmdBuf                  (allocateCommandBuffer(vkd, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY));
+               const VkCommandBufferBeginInfo  beginInfo               =
                {
                        VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
                        DE_NULL,
                        (VkCommandBufferUsageFlags)VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT,
                        (const VkCommandBufferInheritanceInfo*)DE_NULL,
                };
-               const VkImageAspectFlags                        imageAspect             = (VkImageAspectFlags)(format.order == tcu::TextureFormat::D ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT);
-               const VkBufferImageCopy                         copyInfo                =
+               const VkImageAspectFlags                imageAspect             = (VkImageAspectFlags)(format.order == tcu::TextureFormat::D ? VK_IMAGE_ASPECT_DEPTH_BIT : VK_IMAGE_ASPECT_COLOR_BIT);
+               const VkBufferImageCopy                 copyInfo                =
                {
                        0u,
                        1u,
@@ -611,7 +596,7 @@ TestImage::TestImage (Context& context, TextureType texType, tcu::TextureFormat
                        { 0u, 0u, 0u },
                        { 1u, 1u, 1u }
                };
-               const VkImageMemoryBarrier                      preCopyBarrier  =
+               const VkImageMemoryBarrier              preCopyBarrier  =
                {
                        VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
                        DE_NULL,
@@ -630,7 +615,7 @@ TestImage::TestImage (Context& context, TextureType texType, tcu::TextureFormat
                                numLayers
                        }
                };
-               const VkImageMemoryBarrier                      postCopyBarrier =
+               const VkImageMemoryBarrier              postCopyBarrier =
                {
                        VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER,
                        DE_NULL,
@@ -675,14 +660,8 @@ TestImage::TestImage (Context& context, TextureType texType, tcu::TextureFormat
                VK_CHECK(vkd.endCommandBuffer(*cmdBuf));
 
                {
-                       const VkFenceCreateInfo         fenceInfo       =
-                       {
-                               VK_STRUCTURE_TYPE_FENCE_CREATE_INFO,
-                               DE_NULL,
-                               (VkFenceCreateFlags)0,
-                       };
-                       const Unique<VkFence>           fence           (createFence(vkd, device, &fenceInfo));
-                       const VkSubmitInfo                      submitInfo      =
+                       const Unique<VkFence>   fence           (createFence(vkd, device));
+                       const VkSubmitInfo              submitInfo      =
                        {
                                VK_STRUCTURE_TYPE_SUBMIT_INFO,
                                DE_NULL,