Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 30 Nov 2017 15:45:30 +0000 (16:45 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 1 Dec 2017 11:24:13 +0000 (12:24 +0100)
commit9489a43414871e846b389b279b7c055b98867015
tree7a9a95f2a892b9386901d7d80619670415c2aa3e
parent848a566ab8c7b1dc6319d425e558a0f0dbd61c3e
parent054ed612df29ced734ba0ead4ee4420618c35a70
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I5c167c3e0789067ce231180b0b9f531b0b1550db
23 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/openglcts/modules/gl/CMakeLists.txt
external/vulkancts/modules/vulkan/api/vktApiCommandBuffersTests.cpp
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/draw/vktDrawDifferingInterpolationTests.cpp
external/vulkancts/modules/vulkan/draw/vktDrawImageObjectUtil.cpp
external/vulkancts/modules/vulkan/draw/vktDrawNegativeViewportHeightTests.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassSampleReadTests.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/texture/vktTextureTestUtil.cpp
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/mustpass/1.0.1/src/master.txt
external/vulkancts/mustpass/1.0.1/vk-default.txt
external/vulkancts/mustpass/1.0.2/src/master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/mustpass/1.1.0/vk-default.txt