Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
commit6778414948f2869f98752042336fcb9a11ce41cb
tree228f8f7d09fd9847ff73cbc6e0bfec27e2b35327
parentf6331a3bb3753472a2676790bbef01c99a14dec0
parent52df39179d91b6b19a63320435f52aa7ffc4eff2
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: Ic9b507e089a6ce333bf25acbe7c3d3ee6c180aa0
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp