Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:46:24 +0000 (14:46 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:52:50 +0000 (14:52 +0200)
commitdfc090a82d0e9d6db54e022f96d9cd02d39f70a4
treea7acff2dab4612e41dbb9dcb4b57d4a9baef0fd4
parentaa4a3851fa2aa90bf96c69e2c6839ff745848725
parentfbf336b4ad1872e99f49e81bd9a5562d43fa13c4
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: I52a560f1c5cbd065182b36b6e8bff7d3a9c81879
14 files changed:
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsVoteTests.cpp
external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
external/vulkancts/mustpass/1.1.2/src/master.txt
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.2/vk-default.txt
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in