From e0d77f76b56e0620447b3ba5b559985feab75e8a Mon Sep 17 00:00:00 2001 From: Kbz-8 Date: Sat, 1 Mar 2025 16:19:33 +0100 Subject: [PATCH] fixing unit tests --- Tests/Vulkan/Buffer.c | 36 ++++++++++++++++++++++++++++++------ Tests/Vulkan/Common.c | 22 ++++++++++++++++++++++ Tests/Vulkan/Common.h | 1 + 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/Tests/Vulkan/Buffer.c b/Tests/Vulkan/Buffer.c index 712f09c..567caf9 100644 --- a/Tests/Vulkan/Buffer.c +++ b/Tests/Vulkan/Buffer.c @@ -307,13 +307,21 @@ void TestBufferComputeWrite() TEST_ASSERT_TRUE_MESSAGE(PulseWaitForFences(device, &fence, 1, true), PulseVerbaliseErrorType(PulseGetLastErrorType())); { + buffer_create_info.usage = PULSE_BUFFER_USAGE_TRANSFER_UPLOAD | PULSE_BUFFER_USAGE_TRANSFER_DOWNLOAD; + PulseBuffer mappable_buffer = PulseCreateBuffer(device, &buffer_create_info); + TEST_ASSERT_NOT_EQUAL_MESSAGE(mappable_buffer, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType())); + + CopySameSizeBufferToBuffer(device, buffer, mappable_buffer, buffer_create_info.size); + void* ptr; uint32_t data[256]; memset(data, 0xFF, 256 * sizeof(uint32_t)); - TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(buffer, PULSE_MAP_READ, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); + TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(mappable_buffer, PULSE_MAP_READ, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); TEST_ASSERT_NOT_NULL(ptr); TEST_ASSERT_EQUAL(memcmp(ptr, data, 256 * sizeof(uint32_t)), 0); - PulseUnmapBuffer(buffer); + PulseUnmapBuffer(mappable_buffer); + + PulseDestroyBuffer(device, mappable_buffer); } PulseReleaseCommandList(device, cmd); @@ -346,11 +354,19 @@ void TestBufferComputeCopy() TEST_ASSERT_NOT_EQUAL_MESSAGE(read_buffer, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType())); { + buffer_create_info.usage = PULSE_BUFFER_USAGE_TRANSFER_UPLOAD | PULSE_BUFFER_USAGE_TRANSFER_DOWNLOAD; + PulseBuffer mappable_buffer = PulseCreateBuffer(device, &buffer_create_info); + TEST_ASSERT_NOT_EQUAL_MESSAGE(mappable_buffer, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType())); + void* ptr; - TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(read_buffer, PULSE_MAP_WRITE, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); + TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(mappable_buffer, PULSE_MAP_WRITE, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); TEST_ASSERT_NOT_NULL(ptr); memcpy(ptr, data, 256 * sizeof(uint32_t)); - PulseUnmapBuffer(read_buffer); + PulseUnmapBuffer(mappable_buffer); + + CopySameSizeBufferToBuffer(device, mappable_buffer, read_buffer, buffer_create_info.size); + + PulseDestroyBuffer(device, mappable_buffer); } buffer_create_info.usage = PULSE_BUFFER_USAGE_STORAGE_WRITE | PULSE_BUFFER_USAGE_TRANSFER_DOWNLOAD; @@ -377,11 +393,19 @@ void TestBufferComputeCopy() TEST_ASSERT_TRUE_MESSAGE(PulseWaitForFences(device, &fence, 1, true), PulseVerbaliseErrorType(PulseGetLastErrorType())); { + buffer_create_info.usage = PULSE_BUFFER_USAGE_TRANSFER_UPLOAD | PULSE_BUFFER_USAGE_TRANSFER_DOWNLOAD; + PulseBuffer mappable_buffer = PulseCreateBuffer(device, &buffer_create_info); + TEST_ASSERT_NOT_EQUAL_MESSAGE(mappable_buffer, PULSE_NULL_HANDLE, PulseVerbaliseErrorType(PulseGetLastErrorType())); + + CopySameSizeBufferToBuffer(device, write_buffer, mappable_buffer, buffer_create_info.size); + void* ptr; - TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(write_buffer, PULSE_MAP_READ, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); + TEST_ASSERT_NOT_EQUAL_MESSAGE(PulseMapBuffer(mappable_buffer, PULSE_MAP_READ, &ptr), false, PulseVerbaliseErrorType(PulseGetLastErrorType())); TEST_ASSERT_NOT_NULL(ptr); TEST_ASSERT_EQUAL(memcmp(ptr, data, 256 * sizeof(uint32_t)), 0); - PulseUnmapBuffer(write_buffer); + PulseUnmapBuffer(mappable_buffer); + + PulseDestroyBuffer(device, mappable_buffer); } PulseReleaseCommandList(device, cmd); diff --git a/Tests/Vulkan/Common.c b/Tests/Vulkan/Common.c index 08c7281..043513b 100644 --- a/Tests/Vulkan/Common.c +++ b/Tests/Vulkan/Common.c @@ -68,3 +68,25 @@ void CleanupPipeline(PulseDevice device, PulseComputePipeline pipeline) { PulseDestroyComputePipeline(device, pipeline); } + +void CopySameSizeBufferToBuffer(PulseDevice device, PulseBuffer src, PulseBuffer dst, PulseDeviceSize size) +{ + PulseFence fence = PulseCreateFence(device); + PulseCommandList cmd = PulseRequestCommandList(device, PULSE_COMMAND_LIST_TRANSFER_ONLY); + + PulseBufferRegion src_region = { 0 }; + src_region.buffer = src; + src_region.size = size; + + PulseBufferRegion dst_region = { 0 }; + dst_region.buffer = dst; + dst_region.size = size; + + PulseCopyBufferToBuffer(cmd, &src_region, &dst_region); + + PulseSubmitCommandList(device, cmd, fence); + PulseWaitForFences(device, &fence, 1, true); + + PulseReleaseCommandList(device, cmd); + PulseDestroyFence(device, fence); +} diff --git a/Tests/Vulkan/Common.h b/Tests/Vulkan/Common.h index 364c94e..7df4785 100644 --- a/Tests/Vulkan/Common.h +++ b/Tests/Vulkan/Common.h @@ -39,5 +39,6 @@ void LoadComputePipeline(PulseDevice device, PulseComputePipeline* pipeline, con uint32_t num_readwrite_storage_buffers, uint32_t num_uniform_buffers); void CleanupPipeline(PulseDevice device, PulseComputePipeline pipeline); +void CopySameSizeBufferToBuffer(PulseDevice device, PulseBuffer src, PulseBuffer dst, PulseDeviceSize size); #endif