Merge commit '0f5658c72b495abc614f34f99067d7c662670ac3' into deqp-dev
authorMika Isojärvi <misojarvi@google.com>
Tue, 18 Jul 2017 17:56:40 +0000 (10:56 -0700)
committerMika Isojärvi <misojarvi@google.com>
Tue, 18 Jul 2017 17:56:40 +0000 (10:56 -0700)
commit51a288cf8d23830fb48d5b9cf61c7e5cda7301c4
treef17d18006d2ece9f4e40eb2541f53c3a8c77fbf8
parent9186418323e535eaa54605acb0a29b603bda25c7
parent0f5658c72b495abc614f34f99067d7c662670ac3
Merge commit '0f5658c72b495abc614f34f99067d7c662670ac3' into deqp-dev

Test: Ran scripts/check_build_sanity.py and build the apk.
Change-Id: I3da7b4f80e47bfb3a7872e93691b4920157ef06f
27 files changed:
AndroidGen.mk
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/vktApiBufferTests.cpp
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiTests.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/src/test-issues.txt
external/vulkancts/mustpass/1.0.3/vk-default.txt