Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 19 Nov 2018 12:45:38 +0000 (13:45 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 19 Nov 2018 12:45:38 +0000 (13:45 +0100)
commit8ba37066fc47c6433ab9b104d652da04abb0b510
tree0f7a08e622f727bbba57961bb4ed21dcfe93cb9c
parent5a65480e2223c9e81d9c92fd0df84ae1a0762c3e
parent8e3741675ba9ebfdea5bc98ac2df4e5e6f182e57
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ic574b631e36c8328dba3fc2c74936dccc0c39a80
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt