Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 31 Aug 2017 18:12:11 +0000 (20:12 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 1 Sep 2017 07:34:23 +0000 (09:34 +0200)
commitf4f4440fb343e2ae0d11e27e3631e713e9a76e89
treed30cef584e288fd1e1c2754803fa079de5b406c2
parentf24269bdd0c4d3801c2118b153082f0b0223f55a
parentfa048169a247c3d4348ff7a24173ef39c28d4164
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: If018dc6d1a4134e6890419870b28dead7b7f895c
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.0.3/vk-default.txt