From 6bdb0d6f6e8151e8a3909f6045a5135d1bd8cc8f Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 12 Jan 2018 11:34:00 -0800 Subject: [PATCH] Reinstate excluded UBO tests These were excluded in O CTS because of an inadvertent shader codegen change. Reinstate the tests for the next version. Bug: b/71902667 Test: check_build_sanity Change-Id: I58dd09d7d7d43081f27287bfa51d7f63d6b1e51b Affects: dEQP-VK.ubo.random.* --- android/cts/master/src/vk-excluded-tests.txt | 5 ----- android/cts/master/vk-master.txt | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt index ddd101d..00b6fe0 100644 --- a/android/cts/master/src/vk-excluded-tests.txt +++ b/android/cts/master/src/vk-excluded-tests.txt @@ -336,11 +336,6 @@ dEQP-VK.glsl.builtin_var.fragcoord_msaa.* dEQP-VK.memory.requirements.dedicated_allocation.buffer.* dEQP-VK.memory.requirements.dedicated_allocation.image.* -# Issue: b/67013571 -dEQP-VK.ubo.random.all_out_of_order_offsets.11 -dEQP-VK.ubo.random.all_out_of_order_offsets.45 -dEQP-VK.ubo.random.all_shared_buffer.48 - # Issue: b/66464066 dEQP-VK.wsi.android.shared_presentable_image.scale_down.* diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 0078b17..3da3f2a 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -169760,6 +169760,7 @@ dEQP-VK.ubo.random.all_shared_buffer.44 dEQP-VK.ubo.random.all_shared_buffer.45 dEQP-VK.ubo.random.all_shared_buffer.46 dEQP-VK.ubo.random.all_shared_buffer.47 +dEQP-VK.ubo.random.all_shared_buffer.48 dEQP-VK.ubo.random.all_shared_buffer.49 dEQP-VK.ubo.random.all_out_of_order_offsets.0 dEQP-VK.ubo.random.all_out_of_order_offsets.1 @@ -169772,6 +169773,7 @@ dEQP-VK.ubo.random.all_out_of_order_offsets.7 dEQP-VK.ubo.random.all_out_of_order_offsets.8 dEQP-VK.ubo.random.all_out_of_order_offsets.9 dEQP-VK.ubo.random.all_out_of_order_offsets.10 +dEQP-VK.ubo.random.all_out_of_order_offsets.11 dEQP-VK.ubo.random.all_out_of_order_offsets.12 dEQP-VK.ubo.random.all_out_of_order_offsets.13 dEQP-VK.ubo.random.all_out_of_order_offsets.14 @@ -169805,6 +169807,7 @@ dEQP-VK.ubo.random.all_out_of_order_offsets.41 dEQP-VK.ubo.random.all_out_of_order_offsets.42 dEQP-VK.ubo.random.all_out_of_order_offsets.43 dEQP-VK.ubo.random.all_out_of_order_offsets.44 +dEQP-VK.ubo.random.all_out_of_order_offsets.45 dEQP-VK.ubo.random.all_out_of_order_offsets.46 dEQP-VK.ubo.random.all_out_of_order_offsets.47 dEQP-VK.ubo.random.all_out_of_order_offsets.48 -- 2.7.4