Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 6 Sep 2017 12:47:15 +0000 (14:47 +0200)
commit1ed3796e7a275a3091a97a114ade2655afc0c92a
tree6366eff98c27d958d67200292a899d3260fdbc9d
parentf4f4440fb343e2ae0d11e27e3631e713e9a76e89
parent3b4e8cad38bdf023ea873ba161574f426a8ea4d6
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: If10f8037306b1014567751bdcc9bb97e7baf1a2c
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp