Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
commit179b9651152db3ded2bccdad02ad0424f3ef7570
tree0c4289b326167795648885e05017273d77c1f58e
parent96cfa5fd825d6bb4426f8d80417ac2006811ca57
parent9da901f1e54c8aa26a0b2c5f42b04c367b5b76d4
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/master

Change-Id: I2a4a1873df0d05a2333a91cdaadf7a347905e717
external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp