Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

Change-Id: Idb97b061d30a64beae623ba5f4a1b30b0ee10d63

diff --cc external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
index 5708bba,0ace0d1..20d8df0
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
@@@ -640,8 -640,7 +640,7 @@@ StencilTestInstance::StencilTestInstanc
  
                        m_graphicsPipelines[quadNdx].setDefaultRasterizerDiscardEnable(!m_colorAttachmentEnable)
                                                                                .setDefaultMultisampleState()
-                                                                               .setDefaultColorBlendState()
 -                                                                              .setupVertexInputStete(&vertexInputStateParams)
 +                                                                              .setupVertexInputState(&vertexInputStateParams)
                                                                                .setupPreRasterizationShaderState(viewports,
                                                                                                                                                  scissors,
                                                                                                                                                  *m_pipelineLayout,

diff --cc external/vulkancts/modules/vulkan/query_pool/vktQueryPoolStatisticsTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
index f2fb52f,5712ee4..f779470
--- 1/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
--- 2/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
+++ b/external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildTests.cpp
@@@ -488,11 -447,12 +488,11 @@@ de::MovePtr<BufferWithMemory> RayTracin
        {
                cmdPipelineImageMemoryBarrier(vkd, *cmdBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, &preImageBarrier);
                vkd.cmdClearColorImage(*cmdBuffer, **image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clearValue.color, 1, &imageSubresourceRange);
-               cmdPipelineImageMemoryBarrier(vkd, *cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR, &postImageBarrier);
+               cmdPipelineImageMemoryBarrier(vkd, *cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR, &postImageBarrier);
  
 -              bottomLevelAccelerationStructures = initBottomAccelerationStructures(*cmdBuffer, useGpuBuild, workerThreadsCount);
 -              topLevelAccelerationStructure = initTopAccelerationStructure(*cmdBuffer, useGpuBuild, workerThreadsCount, bottomLevelAccelerationStructures);
 +              topLevelAccelerationStructure = initTopAccelerationStructure(useGpuBuild, workerThreadsCount, blasPool);
 +              createTopAccelerationStructure(*cmdBuffer, topLevelAccelerationStructure.get());
  
 -              const TopLevelAccelerationStructure*                    topLevelAccelerationStructurePtr                = topLevelAccelerationStructure.get();
                VkWriteDescriptorSetAccelerationStructureKHR    accelerationStructureWriteDescriptorSet =
                {
                        VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR,      //  VkStructureType                                             sType;