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

Change-Id: I82927bcfd12aa937e4c4c4a44b016e760664cd31

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
index f8fad178500c9cc57488c5f36d22cb14584bf5f0,f8bb34922caa0a9635e4ab5d6dffdea8a0af043a..260b83a2664c0ef58c79ddca968ea365beecbaea
--- 1/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
--- 2/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
@@@ -1135,16 -956,12 +1135,16 @@@ tcu::TestStatus ExtendedDynamicStateIns
                for (auto b : buffersToFill)
                {
                        // Fill bytes surrounding vertex data with the offScreenVertex.
 -                      fillWithPattern(*b, 0u, offset, &offScreenVertex, offScreenVertexSz);
 -                      fillWithPattern(*b, offset + dataSize, extraSize, &offScreenVertex, offScreenVertexSz);
 +                      fillWithPattern(*b, 0u, offset, offScreenVertex.data(), offScreenVertexSz);
 +                      fillWithPattern(*b, offset + dataSize, extraSize, offScreenVertex.data(), offScreenVertexSz);
                }
  
-               copyAndFlush(vkd, device, vertBuffer, offset, vertices.data(), dataSize);
-               copyAndFlush(vkd, device, rvertBuffer, offset, reversedVertices.data(), dataSize);
 +              // Create vectors with all vertex data and all reversed vertex data concatenated in order to fill the buffers.
 +              const auto vertices                     = concatenateVertexData(vertexRawPtrs);
 +              const auto reversedVertices     = concatenateVertexData(reversedVertexRawPtrs);
 +
+               copyAndFlush(vkd, device, vertBuffer, offset, vertices.data(), static_cast<size_t>(vertices.size() * sizeof(vertices[0])));
+               copyAndFlush(vkd, device, rvertBuffer, offset, reversedVertices.data(), static_cast<size_t>(reversedVertices.size() * sizeof(reversedVertices[0])));
        }
  
        // Descriptor set layout.

diff --cc external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
Simple merge

diff --cc framework/common/tcuTextureUtil.cpp
Simple merge