From de1d520cafba28b0b9e1e8d82ba88956a0c18a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 12 Dec 2020 14:04:18 +0100 Subject: [PATCH] Vk: no need to prefix with Vk:: in tests. --- src/Magnum/Vk/Test/BufferVkTest.cpp | 12 ++++++------ src/Magnum/Vk/Test/ImageVkTest.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Magnum/Vk/Test/BufferVkTest.cpp b/src/Magnum/Vk/Test/BufferVkTest.cpp index ab75a50a7..433f22f6b 100644 --- a/src/Magnum/Vk/Test/BufferVkTest.cpp +++ b/src/Magnum/Vk/Test/BufferVkTest.cpp @@ -77,7 +77,7 @@ void BufferVkTest::construct() { void BufferVkTest::constructMove() { /* Verify that also the dedicated memory gets moved */ - Buffer a{device(), BufferCreateInfo{BufferUsage::StorageBuffer, 1024}, Vk::MemoryFlag::DeviceLocal}; + Buffer a{device(), BufferCreateInfo{BufferUsage::StorageBuffer, 1024}, MemoryFlag::DeviceLocal}; VkBuffer handle = a.handle(); VkDeviceMemory memoryHandle = a.dedicatedMemory().handle(); @@ -134,9 +134,9 @@ void BufferVkTest::bindMemory() { CORRADE_COMPARE_AS(offset, requirements.alignment(), TestSuite::Compare::Divisible); - Vk::Memory memory{device(), Vk::MemoryAllocateInfo{ + Memory memory{device(), MemoryAllocateInfo{ requirements.size() + offset, - device().properties().pickMemory(Vk::MemoryFlag::DeviceLocal, requirements.memories())}}; + device().properties().pickMemory(MemoryFlag::DeviceLocal, requirements.memories())}}; buffer.bindMemory(memory, offset); CORRADE_VERIFY(!buffer.hasDedicatedMemory()); @@ -148,9 +148,9 @@ void BufferVkTest::bindDedicatedMemory() { /** @todo expand once KHR_dedicated_allocation is implemented */ - Vk::Memory memory{device(), Vk::MemoryAllocateInfo{ + Memory memory{device(), MemoryAllocateInfo{ requirements.size(), - device().properties().pickMemory(Vk::MemoryFlag::DeviceLocal, requirements.memories())}}; + device().properties().pickMemory(MemoryFlag::DeviceLocal, requirements.memories())}}; VkDeviceMemory handle = memory.handle(); CORRADE_VERIFY(handle); @@ -162,7 +162,7 @@ void BufferVkTest::bindDedicatedMemory() { void BufferVkTest::directAllocation() { Buffer buffer{device(), BufferCreateInfo{BufferUsage::StorageBuffer, 16384}, - Vk::MemoryFlag::DeviceLocal}; + MemoryFlag::DeviceLocal}; /* Not sure what else to test here */ CORRADE_VERIFY(buffer.hasDedicatedMemory()); diff --git a/src/Magnum/Vk/Test/ImageVkTest.cpp b/src/Magnum/Vk/Test/ImageVkTest.cpp index 1fde01e8f..d5d90a9f4 100644 --- a/src/Magnum/Vk/Test/ImageVkTest.cpp +++ b/src/Magnum/Vk/Test/ImageVkTest.cpp @@ -165,7 +165,7 @@ void ImageVkTest::constructMove() { /* Verify that also the dedicated memory gets moved */ Image a{device(), ImageCreateInfo2D{ImageUsage::ColorAttachment, VK_FORMAT_R8G8B8A8_UNORM, {256, 256}, 1}, - Vk::MemoryFlag::DeviceLocal}; + MemoryFlag::DeviceLocal}; VkImage handle = a.handle(); VkDeviceMemory memoryHandle = a.dedicatedMemory().handle(); @@ -238,9 +238,9 @@ void ImageVkTest::bindMemory() { CORRADE_COMPARE_AS(offset, requirements.alignment(), TestSuite::Compare::Divisible); - Vk::Memory memory{device(), Vk::MemoryAllocateInfo{ + Memory memory{device(), MemoryAllocateInfo{ requirements.size() + offset, - device().properties().pickMemory(Vk::MemoryFlag::DeviceLocal, requirements.memories())}}; + device().properties().pickMemory(MemoryFlag::DeviceLocal, requirements.memories())}}; image.bindMemory(memory, offset); CORRADE_VERIFY(!image.hasDedicatedMemory()); @@ -253,9 +253,9 @@ void ImageVkTest::bindDedicatedMemory() { /** @todo expand once KHR_dedicated_allocation is implemented */ - Vk::Memory memory{device(), Vk::MemoryAllocateInfo{ + Memory memory{device(), MemoryAllocateInfo{ requirements.size(), - device().properties().pickMemory(Vk::MemoryFlag::DeviceLocal, requirements.memories())}}; + device().properties().pickMemory(MemoryFlag::DeviceLocal, requirements.memories())}}; VkDeviceMemory handle = memory.handle(); CORRADE_VERIFY(handle); @@ -266,7 +266,7 @@ void ImageVkTest::bindDedicatedMemory() { void ImageVkTest::directAllocation() { Image image{device(), ImageCreateInfo2D{ImageUsage::Sampled, - VK_FORMAT_R8G8B8A8_UNORM, {256, 256}, 8}, Vk::MemoryFlag::DeviceLocal}; + VK_FORMAT_R8G8B8A8_UNORM, {256, 256}, 8}, MemoryFlag::DeviceLocal}; /* Not sure what else to test here */ CORRADE_VERIFY(image.hasDedicatedMemory());