Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Dec 2017 12:34:22 +0000 (13:34 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 14 Dec 2017 13:01:11 +0000 (14:01 +0100)
commit325389fbcb87bcdfe23d7eed12068c38f4c43003
treec0700f26b79dfe34904e67e6c463fda2ae772caa
parent9525424e03dc412ea8b3e9541c11aa18a9f2ca06
parent4cb6ce02a1a6d7f3157375b635fc6c249da09b37
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6c2cf9762fd2c60c997c286040a4fef79f029fb5
15 files changed:
AndroidGen.mk
CMakeLists.txt
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
external/vulkancts/modules/vulkan/image/vktImageTestsUtil.cpp
external/vulkancts/modules/vulkan/image/vktImageTranscodingSupportTests.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp
external/vulkancts/modules/vulkan/wsi/vktWsiColorSpaceTests.cpp
external/vulkancts/mustpass/1.1.0/vk-default.txt