Fix a merge error after adding VK_KHR_driver_properties
authorMaciej Jesionowski <maciej.jesionowski@amd.com>
Tue, 10 Jul 2018 07:34:59 +0000 (09:34 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 10 Jul 2018 18:37:16 +0000 (14:37 -0400)
commitb0dc23fff658132f6ba6dafcdabcd67caa09839b
treed447a300c0615ea8575bc41f8c4a69bf90771184
parenteb5806aab57fdf89850be8916e194c3d3b54c8d9
Fix a merge error after adding VK_KHR_driver_properties

Components: Vulkan

Affects:
dEQP-VK.api.info.get_physical_device_properties2.features

Change-Id: Ibeddf2320603661fdfbb68f246aeb2d7c570e890
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp