Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 27 Oct 2017 09:58:34 +0000 (11:58 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 27 Oct 2017 09:58:34 +0000 (11:58 +0200)
commit7d374dbff2d468fe5fa396a01543ed79f6fcd058
tree66a2033f5550f9588d076f9c1ffab8045e161d7c
parent9e67cc800fdd31a5443af7894e90c49c20e7c175
parentab6b0ac1824ce0b091830042110cf3b3ea17e895
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: If68842d1d3dc3ae819477948da5a66f6c1fbedc1
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
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/mustpass/1.1.0/vk-default.txt