From 11bfc063db2b32fbda21b17d232739469c9738a1 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Wed, 19 Dec 2018 17:01:35 -0700 Subject: [PATCH] Fix memory requirements for draw_clear tests The memory requirements for the draw_clear subtests of the conditional_rendering group required the memory bound for the conditional rendering predicate buffer to be both host visible and device local. It's not a requirement that all implementation support this combinations so all the draw_clear tests were skipped unnecessarily. Since the device local requirement was unnecessary, this CL just removes it. Affects: dEQP-VK.conditional_rendering.draw_clear.* Change-Id: I10d289a7666a97d665707d5e49ec7c8846d2997d Components: Vulkan --- .../vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp index db1aeea..cf4c6ff 100644 --- a/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp +++ b/external/vulkancts/modules/vulkan/conditional_rendering/vktConditionalDrawAndClearTests.cpp @@ -133,7 +133,7 @@ const DrawTestParams drawTestGrid[] = { false, true, true, 0b1010, 0b1010, 0b1111, false, NONE }, { true, true, true, 0b0010, 0b1000, 0b0001, false, NONE }, { true, true, true, 0b1001, 0b1001, 0b0110, false, NONE }, - { true, true, true, 0b0010, 0b1000, 0b1111, true, FILL}, + { true, true, true, 0b0010, 0b1000, 0b1111, true, FILL }, { true, true, true, 0b1001, 0b1001, 0b1111, true, FILL }, { false, true, true, 0b1001, 0b1001, 0b0110, true, FILL }, { true, true, true, 0b0010, 0b1000, 0b1111, true, COPY }, @@ -287,7 +287,7 @@ void ConditionalRenderingBaseTestInstance::createInitBufferWithPredicate (bool d deUint32 predicate = discard ? invert : !invert; m_conditionalRenderingBuffer = Buffer::createAndAlloc(m_vkd, m_device, BufferCreateInfo(dataSize, VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT | extraUsage), m_context.getDefaultAllocator(), - MemoryRequirement::HostVisible | MemoryRequirement::Local); + MemoryRequirement::HostVisible); void * conditionalRenderingBufferDataPointer = static_cast(m_conditionalRenderingBuffer->getBoundMemory().getHostPtr()) + m_conditionalRenderingBufferOffset; -- 2.7.4