From: Pyry Haulos <phaulos@google.com>
Date: Fri, 8 Jan 2016 20:35:36 +0000 (-0800)
Subject: Merge changes from Khronos repository
X-Git-Tag: upstream/0.1.0~812^2~394
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fddcfc0946a02d466e44dbe11081a71a2a4e1546;p=platform%2Fupstream%2FVK-GL-CTS.git

Merge changes from Khronos repository
---

fddcfc0946a02d466e44dbe11081a71a2a4e1546
diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
index 2914a4f01,da881b79b..201050669
--- a/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,