Merge vk-gl-cts/vulkan-cts-1.3.1 into vk-gl-cts/main

Change-Id: I7e8890118a65a9d1833a167cdbb80d87d2a38077

diff --cc external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
index 7506a97,71da172..371a984
--- 1/external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
--- 2/external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
@@@ -1437,10 -1379,13 +1437,13 @@@ void BottomLevelAccelerationStructureKH
                VkDeviceOrHostAddressConstKHR                                                   vertexData, indexData;
                if (m_buildType == VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR)
                {
 -                      if (m_vertexBuffer.get() != DE_NULL)
 +                      if (getVertexBuffer() != DE_NULL)
                        {
 -                              vertexData                      = makeDeviceOrHostAddressConstKHR(vk, device, m_vertexBuffer->get(), vertexBufferOffset);
 +                              vertexData                      = makeDeviceOrHostAddressConstKHR(vk, device, getVertexBuffer()->get(), vertexBufferOffset);
-                               vertexBufferOffset      += deAlignSize(geometryData->getVertexByteSize(), 8);
+                               if (m_indirectBuffer == DE_NULL )
+                               {
+                                       vertexBufferOffset      += deAlignSize(geometryData->getVertexByteSize(), 8);
+                               }
                        }
                        else
                                vertexData                      = makeDeviceOrHostAddressConstKHR(DE_NULL);

diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/compute/vktComputeZeroInitializeWorkgroupMemoryTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsArithmeticTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotBroadcastTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBasicTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsClusteredTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsPartitionedTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsQuadTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsShuffleTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
Simple merge