Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 27 Feb 2018 14:08:05 +0000 (15:08 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 27 Feb 2018 16:26:10 +0000 (17:26 +0100)
commit97cbd48b370ca648f28e071b23aca98aac82dbdf
treee283b4d19c3fb13cf6e523e5876f796181b716f2
parent04fd9a8b843f4cd1580632ae4ecfd3fd99f8dd55
parentd9a3b7b1c967a2c0673aeabf19d0705a27285599
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6b88acb64b5ff7cd03e1d52d61d93545c27bf21e
20 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/README.md
external/vulkancts/framework/vulkan/vkImageUtil.cpp
external/vulkancts/modules/vulkan/api/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiDeviceInitializationTests.cpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/api/vktApiTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureFunctionTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrConversionTests.cpp
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.2/vk-default.txt