Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 18 Aug 2017 11:44:48 +0000 (13:44 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 18 Aug 2017 11:44:48 +0000 (13:44 +0200)
commit42930d3dbd67384f6f76e7b182e125a66ac6ce45
tree53f852907e76ee00a8f37cd5e5578ac00ae1e0e1
parent04e0b933ea3c81ffd6964aecc2e295d7207c876a
parent42d218eb376986969507b5a0693dd444c27f6ace
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: If0522fee34abd42178dce1878d65f663c60a5d5a
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderCase.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.0.3/vk-default.txt