Merge branch vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 10 Jul 2017 19:15:01 +0000 (21:15 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 10 Jul 2017 19:15:01 +0000 (21:15 +0200)
commit41c36e6e81f81b2b39893b9d0d2e60093a72d935
treee56859336f4aed7e451fe0875346cb973d09b2da
parent4e82d99e448dd22a697e3eff3b0fd1faf1e017c6
parent8501d2f862d888191fd7a19f188d55d99de8d592
Merge branch vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: I393c1b28bd020822cb2bb6d564b5de2b6b87b55a
28 files changed:
AndroidGen.mk
android/cts/master/src/vk-excluded-tests.txt
android/cts/master/vk-master.txt
android/cts/nyc/src/vk-master.txt
android/cts/nyc/vk-master.txt
external/fetch_sources.py
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/api/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassMultisampleTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/synchronization/CMakeLists.txt
external/vulkancts/mustpass/1.0.0/src/master.txt
external/vulkancts/mustpass/1.0.0/vk-default.txt
external/vulkancts/mustpass/1.0.1/src/master.txt
external/vulkancts/mustpass/1.0.1/vk-default.txt
external/vulkancts/mustpass/1.0.2/src/master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/mustpass/1.0.3/src/excluded-tests.txt
external/vulkancts/mustpass/1.0.3/vk-default.txt