Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: If4c022edf815bc00ea6b8f64bb6aeac6ba44fbe6

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp
index d7c3a9b,c996d32..de5ae98
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingBufferDeviceAddressTests.cpp
@@@ -166,8 -163,11 +166,11 @@@ void BufferAddressTestCase::checkSuppor
        if (m_data.set >= context.getDeviceProperties().limits.maxBoundDescriptorSets)
                TCU_THROW(NotSupportedError, "descriptor set number not supported");
  
+       if (m_data.convertUToPtr == VK_TRUE && !context.getDeviceFeatures().shaderInt64)
+               TCU_THROW(NotSupportedError, "64-bit integers in shader not supported");
+ 
        if (m_data.bufType == BT_REPLAY &&
 -              !context.getBufferDeviceAddressFeatures().bufferDeviceAddressCaptureReplay)
 +              !(context.getBufferDeviceAddressFeaturesEXT().bufferDeviceAddressCaptureReplay || context.getBufferDeviceAddressFeatures().bufferDeviceAddressCaptureReplay))
                TCU_THROW(NotSupportedError, "Capture/replay of physical storage buffer pointers not supported");
  
        if (m_data.layout == LAYOUT_SCALAR && !context.getScalarBlockLayoutFeatures().scalarBlockLayout)