Merge changes from Khronos repository

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index 2914a4f01ea2a47997fe013df4a64fb64920eac9,da881b79b34d2cc02a2af18276c086da2bba50d6..201050669d2734073edda338f8da202d4528ae4b
--- 1/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
--- 2/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
+++ b/external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
@@@ -1074,9 -1074,10 +1074,10 @@@ ImageLoadStoreTestInstance::ImageLoadSt
        : LoadStoreTestInstance (context, texture, format, imageFormat, singleLayerBind)
        , m_perLayerData                (texture.numLayers())
  {
-       const DeviceInterface&  vk                                      = m_context.getDeviceInterface();
-       const VkDevice                  device                          = m_context.getDevice();
-       Allocator&                              allocator                       = m_context.getDefaultAllocator();
+       const DeviceInterface&          vk                                      = m_context.getDeviceInterface();
+       const VkDevice                          device                          = m_context.getDevice();
+       Allocator&                                      allocator                       = m_context.getDefaultAllocator();
 -      const VkImageCreateFlags        imageFlags                      = (m_format == m_imageFormat ? 0u : VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT);
++      const VkImageCreateFlags        imageFlags                      = (m_format == m_imageFormat ? 0u : (VkImageCreateFlags)VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT);
  
        m_imageSrc = de::MovePtr<Image>(new Image(
                vk, device, allocator,