Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jul 2019 14:10:23 +0000 (16:10 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 19 Jul 2019 14:10:23 +0000 (16:10 +0200)
commit643d4b29f6720b578b57115b048deefd09ace2d6
treec496bd7afd519cd54c705835744f80035d8bbd15
parent8d6b99fbda10375a9b5b9e036bf644fd5fe4d9e4
parent74ffed6e0b286e6279ed3db1a6c50aad6b387836
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I510f56d1a706648f1b8da895436df251ffecad3d
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/vktBuildPrograms.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt