Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Feb 2018 12:19:09 +0000 (13:19 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 6 Feb 2018 12:19:09 +0000 (13:19 +0100)
commit42b4b15b49b2e482f14a4247034505bafd7d6924
tree66e032855f68fc99a1084218a3d29f8710e9123f
parentf1138e21b92f433541231825a77cf665bc11ede4
parent6ec82d3a312eefb5029ae0a729f84ff85c38f863
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Idebf4d50048133306e2079e02c03e28c9d22b844
AndroidGen.mk
android/cts/master/vk-master.txt
external/openglcts/modules/gles2/es2cTexture3DTests.cpp
external/vulkancts/README.md
external/vulkancts/modules/vulkan/pipeline/vktPipelineMultisampleTests.cpp
external/vulkancts/modules/vulkan/texture/vktTextureCompressedFormatTests.cpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.2/vk-default.txt