Fix issues in pipeline.timestamp.transfer_tests am: 0f672f2a20 am: 9e85a126d2

am: ac400ff59f

Change-Id: I8fd3f2dac244cddb228d780cb2e7ab4943b1cb9b

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
index 692367e..f5dc98d 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
@@ -2016,7 +2016,7 @@ void TransferTestInstance::configCommandBuffer(void)
                                const VkBufferImageCopy bufImageCopy =
                                {
                                        0u,                                     // VkDeviceSize            bufferOffset;
-                                       (deUint32)m_bufSize,                    // deUint32                bufferRowLength;
+                                       (deUint32)m_imageWidth,                 // deUint32                bufferRowLength;
                                        (deUint32)m_imageHeight,                // deUint32                bufferImageHeight;
                                        imgSubResCopy,                          // VkImageSubresourceCopy  imageSubresource;
                                        nullOffset,                             // VkOffset3D              imageOffset;
@@ -2030,7 +2030,7 @@ void TransferTestInstance::configCommandBuffer(void)
                                const VkBufferImageCopy imgBufferCopy =
                                {
                                        0u,                                     // VkDeviceSize            bufferOffset;
-                                       (deUint32)m_bufSize,                    // deUint32                bufferRowLength;
+                                       (deUint32)m_imageWidth,                 // deUint32                bufferRowLength;
                                        (deUint32)m_imageHeight,                // deUint32                bufferImageHeight;
                                        imgSubResCopy,                          // VkImageSubresourceCopy  imageSubresource;
                                        nullOffset,                             // VkOffset3D              imageOffset;
@@ -2140,7 +2140,7 @@ void TransferTestInstance::initialImageTransition (VkCommandBuffer cmdBuffer, Vk
                subRange                                // VkImageSubresourceRange  subresourceRange;
        };
 
-       vk.cmdPipelineBarrier(cmdBuffer, 0, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, 0, DE_NULL, 0, DE_NULL, 1, &imageMemBarrier);
+       vk.cmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, 0, 0, DE_NULL, 0, DE_NULL, 1, &imageMemBarrier);
 }
 
 } // anonymous