From 9286a3db4f529f435ea4270ffc2ca7a7a1da922d Mon Sep 17 00:00:00 2001 From: ladevieq Date: Fri, 3 Feb 2023 09:55:06 +0100 Subject: Start presentation abstraction design --- api-test/main.cpp | 63 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) (limited to 'api-test/main.cpp') diff --git a/api-test/main.cpp b/api-test/main.cpp index 2f973ff..7f30fda 100644 --- a/api-test/main.cpp +++ b/api-test/main.cpp @@ -34,6 +34,36 @@ void ui() { ImGui::Render(); } +void update_buffers(ImDrawData* draw_data, const device_buffer& vertex_buffer, const device_buffer& index_buffer) { + struct vertex { + ImVec2 pos; + ImVec2 uv; + uint32_t color; + uint32_t padding; + }; + + off_t vertex_offset = 0; + off_t index_offset = 0; + for (auto index {0U} ; index < draw_data->CmdListsCount; index++) { + auto* cmd_list = draw_data->CmdLists[index]; + + size_t vertex_bytes_size = sizeof(ImDrawVert) * cmd_list->VtxBuffer.size(); + auto* vtx_ptr = static_cast(vertex_buffer.mapped_ptr) + vertex_offset; + for (auto vtx_index{0}; vtx_index < cmd_list->VtxBuffer.size(); vtx_index++, vtx_ptr++) { + auto& vtx = cmd_list->VtxBuffer[vtx_index]; + vtx_ptr->pos = vtx.pos; + vtx_ptr->uv = vtx.uv; + vtx_ptr->color = vtx.col; + } + // memcpy(static_cast(vertex_buffer.mapped_ptr) + vertex_offset, cmd_list->VtxBuffer.Data, vertex_bytes_size); + vertex_offset += static_cast(vertex_bytes_size); + + size_t index_bytes_size = sizeof(ImDrawIdx) * cmd_list->IdxBuffer.size(); + memcpy(static_cast(index_buffer.mapped_ptr) + index_offset, cmd_list->IdxBuffer.Data, index_bytes_size); + index_offset += static_cast(index_bytes_size); + } +} + int main() { #ifdef ENABLE_RENDERDOC @@ -193,6 +223,7 @@ int main() { command_buffers[0].barrier(gpu_texture_handle, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); command_buffers[0].stop(); + std::array compute_command_buffers = {command_buffers[0]}; device->submit(compute_command_buffers, nullptr, &semaphore); @@ -206,33 +237,7 @@ int main() { ui(); auto* draw_data = ImGui::GetDrawData(); - struct vertex { - ImVec2 pos; - ImVec2 uv; - uint32_t color; - uint32_t padding; - }; - - off_t vertex_offset = 0; - off_t index_offset = 0; - for (auto index {0U} ; index < draw_data->CmdListsCount; index++) { - auto* cmd_list = draw_data->CmdLists[index]; - - size_t vertex_bytes_size = sizeof(ImDrawVert) * cmd_list->VtxBuffer.size(); - auto* vtx_ptr = static_cast(vertex_buffer.mapped_ptr) + vertex_offset; - for (auto vtx_index{0}; vtx_index < cmd_list->VtxBuffer.size(); vtx_index++, vtx_ptr++) { - auto& vtx = cmd_list->VtxBuffer[vtx_index]; - vtx_ptr->pos = vtx.pos; - vtx_ptr->uv = vtx.uv; - vtx_ptr->color = vtx.col; - } - // memcpy(static_cast(vertex_buffer.mapped_ptr) + vertex_offset, cmd_list->VtxBuffer.Data, vertex_bytes_size); - vertex_offset += static_cast(vertex_bytes_size); - - size_t index_bytes_size = sizeof(ImDrawIdx) * cmd_list->IdxBuffer.size(); - memcpy(static_cast(index_buffer.mapped_ptr) + index_offset, cmd_list->IdxBuffer.Data, index_bytes_size); - index_offset += static_cast(index_bytes_size); - } + update_buffers(draw_data, vertex_buffer, index_buffer); device->wait(semaphore); @@ -259,8 +264,6 @@ int main() { printf("%llu\n", sizeof(ImDrawVert)); uint32_t draw_index = 0U; - uint32_t vtx_offset = 0U; - uint32_t idx_offset = 0U; std::array draws; for (auto index {0U} ; index < draw_data->CmdListsCount; index++) { auto* cmd_list = draw_data->CmdLists[index]; @@ -290,7 +293,6 @@ int main() { }); draw_index++; - // vtx_offset += draw_command. } } @@ -303,7 +305,6 @@ int main() { device->submit(ui_command_buffers, nullptr, &semaphore); RD_END_CAPTURE; - // std::system("PAUSE"); break; } -- cgit v1.3