Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 11:15:01 +0000 (13:15 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 12:12:12 +0000 (14:12 +0200)
commit2a48dae9f02b647541fa37d74dbfac2350217a24
tree3f8d0fc7b8fc634ca237c1e0fbaca84c3c4b1d58
parent85d8d86258ff6dcb99964ca4584057c31796829d
parent972548605ea19da08bfd27fc7945a5298828e395
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie175674eca5fd0cbd2fe0b7e9ea5658adf74ba32
AndroidGen.mk
android/cts/master/vk-master.txt
external/fetch_sources.py
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt