Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 25 Sep 2018 13:26:40 +0000 (15:26 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 25 Sep 2018 13:26:40 +0000 (15:26 +0200)
commitb9b972be054e2ec00ba8bb17825f3979da688109
tree52430e965149501911ecab5a2edee2dc05718e5e
parent3dee92df6435d3ee809711d48bdd5c274856cd11
parentbd5689a108f8cea7ea7533fd1304e3272159c52b
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

Change-Id: Idc9e2c7523b11e08a849f226037fd2f2fea1e370
android/package/AndroidManifest.xml
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentClearTests.cpp
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemAttachmentLoadTests.cpp
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemCopyImageToBufferTests.cpp
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemFillUpdateCopyBufferTests.cpp