Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 13:27:17 +0000 (15:27 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 13:27:17 +0000 (15:27 +0200)
commit4b162908e1168e5e9fb55763af83bce59d0240d3
treeab94b15538a0abc8d97c1f804aa14434c51768dd
parent4b16ba6bbd7e97b47244e4fb52ed6ccda37b3a48
parentdfc090a82d0e9d6db54e022f96d9cd02d39f70a4
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie615d2294ca51629dd202087883acee9b0791f51
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt