Fix image validation errors in SPIR-V tests

A helper function for uploading images caused validation errors by
setting the image layout to SHADER_READ_ONLY_OPTIMAL regardless of the
image descriptor type.

A new parameter for defining the image layout was added to the helper
function, and tests using storage images were changed to use GENERAL
layout.

Affects:

dEQP-VK.spirv_assembly.instruction.compute.image_sampler.imageread.storage_image.*

Components: Vulkan, Framework

VK-GL-CTS issue: 1111

Change-Id: I783c87fe2dd91d65537343d1ae88e3a4f07b77c6

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
index 7807983..741ca0d 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@ -2601,7 +2601,8 @@ void copyBufferToImage (const DeviceInterface&                                    vk,
                                                VkImageAspectFlags                                              imageAspectFlags,
                                                deUint32                                                                mipLevels,
                                                deUint32                                                                arrayLayers,
-                                               VkImage                                                                 destImage)
+                                               VkImage                                                                 destImage,
+                                               VkImageLayout                                                   destImageLayout)
 {
        Move<VkCommandPool>             cmdPool         = createCommandPool(vk, device, VK_COMMAND_POOL_CREATE_TRANSIENT_BIT, queueFamilyIndex);
        Move<VkCommandBuffer>   cmdBuffer       = allocateCommandBuffer(vk, device, *cmdPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY);
@@ -2648,7 +2649,7 @@ void copyBufferToImage (const DeviceInterface&                                    vk,
                VK_ACCESS_TRANSFER_WRITE_BIT,                                   // VkAccessFlags                        srcAccessMask;
                VK_ACCESS_SHADER_READ_BIT,                                              // VkAccessFlags                        dstAccessMask;
                VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,                   // VkImageLayout                        oldLayout;
-               VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,               // VkImageLayout                        newLayout;
+               destImageLayout,                                                                // VkImageLayout                        newLayout;
                VK_QUEUE_FAMILY_IGNORED,                                                // deUint32                                     srcQueueFamilyIndex;
                VK_QUEUE_FAMILY_IGNORED,                                                // deUint32                                     dstQueueFamilyIndex;
                destImage,                                                                              // VkImage                                      image;

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.hpp b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
index f834ca3..3d4aac1 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.hpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
@@ -150,7 +150,8 @@ void                                                        copyBufferToImage                               (const DeviceInterface&                                         vk,
                                                                                                                                 vk::VkImageAspectFlags                                         imageAspectFlags,
                                                                                                                                 deUint32                                                                       mipLevels,
                                                                                                                                 deUint32                                                                       arrayLayers,
-                                                                                                                                vk::VkImage                                                            destImage);
+                                                                                                                                vk::VkImage                                                            destImage,
+                                                                                                                                VkImageLayout                                                          destImageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 
 /*--------------------------------------------------------------------*//*!
  * Checks if the physical device supports creation of the specified

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
index 2a85eeb..5e505e6 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
@@ -513,6 +513,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void)
                        inputImages.push_back(ImageHandleSp(image));
                        inputAllocs.push_back(de::SharedPtr<Allocation>(imageAlloc.release()));
 
+                       const VkImageLayout                     imageLayout             = (descType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE) ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
                        const VkBufferImageCopy         copyRegion              =
                        {
                                0u,                                                                                             // VkDeviceSize                         bufferOffset;
@@ -530,7 +531,7 @@ tcu::TestStatus SpvAsmComputeShaderInstance::iterate (void)
                        vector<VkBufferImageCopy>       copyRegions;
                        copyRegions.push_back(copyRegion);
 
-                       copyBufferToImage(vkdi, device, queue, queueFamilyIndex, buffer->get(), (deUint32)numBytes, copyRegions, DE_NULL, VK_IMAGE_ASPECT_COLOR_BIT, 1u, 1u, image->get());
+                       copyBufferToImage(vkdi, device, queue, queueFamilyIndex, buffer->get(), (deUint32)numBytes, copyRegions, DE_NULL, VK_IMAGE_ASPECT_COLOR_BIT, 1u, 1u, image->get(), imageLayout);
                }
        }