Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 6 Jun 2019 15:49:37 +0000 (17:49 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 6 Jun 2019 15:49:37 +0000 (17:49 +0200)
commit9fc0f44f794abd1f1d4365ea7ad3fa5d842bf99c
treec30cedc7ed539a893cedfa56bad8a0cdc6e53fc7
parent60d42cc86a8c3dbaef198a715ae3ebba3a536e9a
parent5be6547cc0d7ff589ee65e54f97be882cb971ea3
Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/master

Change-Id: I593e042d8a7ac25a1d09b07d3a222fe51bef4ebf
external/vulkancts/framework/vulkan/vkExtensionFunctions.inl
external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
external/vulkancts/scripts/gen_framework.py