Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 21 Dec 2017 10:59:19 +0000 (11:59 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 21 Dec 2017 10:59:19 +0000 (11:59 +0100)
commitf1b8c816d3d8c2c9f48b59d24f8a263611c640ba
treec0f9f1aadf706cb7ae56453af5544238fe0201e9
parenta554407a117286e3ac7c6a7b39e4d318ef22b6cc
parent7763f6e68b28413787c638fe5c9f1b20a5579636
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I23fd4e87db24b61dbd7e8c72662e2b4c3b903e54
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
external/vulkancts/modules/vulkan/compute/vktComputeBasicComputeShaderTests.cpp
external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryBindingTests.cpp
external/vulkancts/mustpass/1.1.0/vk-default.txt