Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 25 Sep 2018 13:55:21 +0000 (15:55 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 25 Sep 2018 15:11:23 +0000 (17:11 +0200)
commit8b60ea6f02a2a04b335039b67c08b2795c5d77f4
treec112d8c281693ade83975b798e05b9033886f80c
parent85d69de478e55a2cdad14d4e56c108e257c4bb4b
parent3dee92df6435d3ee809711d48bdd5c274856cd11
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: I6abfb86bd46b492d0cd8f1f7614d13c4480734ea
20 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/framework/vulkan/vkTypeUtil.inl
external/vulkancts/modules/vulkan/api/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/api/vktApiTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmImageSamplerTests.cpp
external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.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