diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b6b3eae6..3eca989976 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,5 +122,5 @@ if (TACTILE_BUILD_OPENGL_RENDERER) endif () if (TACTILE_BUILD_VULKAN_RENDERER) - add_subdirectory("source/vulkan_renderer") + add_subdirectory("source/renderers/vulkan") endif () diff --git a/source/vulkan_renderer/CMakeLists.txt b/source/renderers/vulkan/CMakeLists.txt similarity index 89% rename from source/vulkan_renderer/CMakeLists.txt rename to source/renderers/vulkan/CMakeLists.txt index 92e2a0ae10..fa69f36348 100644 --- a/source/vulkan_renderer/CMakeLists.txt +++ b/source/renderers/vulkan/CMakeLists.txt @@ -1,4 +1,4 @@ -project(tactile-vulkan-renderer CXX) +project(tactile-renderers-vulkan CXX) find_package(SDL2 CONFIG REQUIRED) find_package(Vulkan REQUIRED) diff --git a/source/vulkan_renderer/lib/CMakeLists.txt b/source/renderers/vulkan/lib/CMakeLists.txt similarity index 58% rename from source/vulkan_renderer/lib/CMakeLists.txt rename to source/renderers/vulkan/lib/CMakeLists.txt index 51793447fb..6b7dba5022 100644 --- a/source/vulkan_renderer/lib/CMakeLists.txt +++ b/source/renderers/vulkan/lib/CMakeLists.txt @@ -1,4 +1,4 @@ -project(tactile-vulkan-renderer-lib CXX) +project(tactile-renderers-vulkan-lib CXX) option(TACTILE_USE_VULKAN_SUBSET "Allow partial Vulkan implementations, such as MoltenVK" OFF) @@ -35,32 +35,32 @@ target_sources(tactile-vulkan-renderer "src/vulkan_util.cpp" PUBLIC FILE_SET "HEADERS" BASE_DIRS "inc" FILES - "inc/tactile/vulkan_renderer/api.hpp" - "inc/tactile/vulkan_renderer/imgui_shader_code.hpp" - "inc/tactile/vulkan_renderer/vulkan_allocator.hpp" - "inc/tactile/vulkan_renderer/vulkan_buffer.hpp" - "inc/tactile/vulkan_renderer/vulkan_command_buffer.hpp" - "inc/tactile/vulkan_renderer/vulkan_command_pool.hpp" - "inc/tactile/vulkan_renderer/vulkan_descriptor_pool.hpp" - "inc/tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp" - "inc/tactile/vulkan_renderer/vulkan_device.hpp" - "inc/tactile/vulkan_renderer/vulkan_fence.hpp" - "inc/tactile/vulkan_renderer/vulkan_image.hpp" - "inc/tactile/vulkan_renderer/vulkan_image_view.hpp" - "inc/tactile/vulkan_renderer/vulkan_imgui_context.hpp" - "inc/tactile/vulkan_renderer/vulkan_instance.hpp" - "inc/tactile/vulkan_renderer/vulkan_physical_device.hpp" - "inc/tactile/vulkan_renderer/vulkan_pipeline.hpp" - "inc/tactile/vulkan_renderer/vulkan_pipeline_layout.hpp" - "inc/tactile/vulkan_renderer/vulkan_renderer.hpp" - "inc/tactile/vulkan_renderer/vulkan_renderer_plugin.hpp" - "inc/tactile/vulkan_renderer/vulkan_sampler.hpp" - "inc/tactile/vulkan_renderer/vulkan_semaphore.hpp" - "inc/tactile/vulkan_renderer/vulkan_shader_module.hpp" - "inc/tactile/vulkan_renderer/vulkan_surface.hpp" - "inc/tactile/vulkan_renderer/vulkan_swapchain.hpp" - "inc/tactile/vulkan_renderer/vulkan_texture.hpp" - "inc/tactile/vulkan_renderer/vulkan_util.hpp" + "inc/tactile/vulkan/api.hpp" + "inc/tactile/vulkan/imgui_shader_code.hpp" + "inc/tactile/vulkan/vulkan_allocator.hpp" + "inc/tactile/vulkan/vulkan_buffer.hpp" + "inc/tactile/vulkan/vulkan_command_buffer.hpp" + "inc/tactile/vulkan/vulkan_command_pool.hpp" + "inc/tactile/vulkan/vulkan_descriptor_pool.hpp" + "inc/tactile/vulkan/vulkan_descriptor_set_layout.hpp" + "inc/tactile/vulkan/vulkan_device.hpp" + "inc/tactile/vulkan/vulkan_fence.hpp" + "inc/tactile/vulkan/vulkan_image.hpp" + "inc/tactile/vulkan/vulkan_image_view.hpp" + "inc/tactile/vulkan/vulkan_imgui_context.hpp" + "inc/tactile/vulkan/vulkan_instance.hpp" + "inc/tactile/vulkan/vulkan_physical_device.hpp" + "inc/tactile/vulkan/vulkan_pipeline.hpp" + "inc/tactile/vulkan/vulkan_pipeline_layout.hpp" + "inc/tactile/vulkan/vulkan_renderer.hpp" + "inc/tactile/vulkan/vulkan_renderer_plugin.hpp" + "inc/tactile/vulkan/vulkan_sampler.hpp" + "inc/tactile/vulkan/vulkan_semaphore.hpp" + "inc/tactile/vulkan/vulkan_shader_module.hpp" + "inc/tactile/vulkan/vulkan_surface.hpp" + "inc/tactile/vulkan/vulkan_swapchain.hpp" + "inc/tactile/vulkan/vulkan_texture.hpp" + "inc/tactile/vulkan/vulkan_util.hpp" ) tactile_prepare_target(tactile-vulkan-renderer) diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/api.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/api.hpp similarity index 100% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/api.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/api.hpp diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/imgui_shader_code.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/imgui_shader_code.hpp similarity index 100% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/imgui_shader_code.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/imgui_shader_code.hpp diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_allocator.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_allocator.hpp similarity index 96% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_allocator.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_allocator.hpp index 64eeb8fc2c..874f500f77 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_allocator.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_allocator.hpp @@ -8,7 +8,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_buffer.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_buffer.hpp similarity index 97% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_buffer.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_buffer.hpp index 39d8225d7c..847b9b193c 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_buffer.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_buffer.hpp @@ -9,7 +9,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_buffer.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_buffer.hpp similarity index 94% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_buffer.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_buffer.hpp index 8453cdb7e0..bd70a3a4eb 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_buffer.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_buffer.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_pool.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_pool.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_pool.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_pool.hpp index d768519bb2..f24d6015bd 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_command_pool.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_command_pool.hpp @@ -9,8 +9,8 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_command_buffer.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_command_buffer.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_pool.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_pool.hpp similarity index 94% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_pool.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_pool.hpp index 322bd1a63f..2d949a5347 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_pool.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_pool.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_set_layout.hpp similarity index 93% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_set_layout.hpp index 646c76e4ed..02ac48456b 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_descriptor_set_layout.hpp @@ -5,7 +5,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_device.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_device.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_device.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_device.hpp index eee041ca49..4133754677 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_device.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_device.hpp @@ -8,7 +8,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_fence.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_fence.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_fence.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_fence.hpp index f79e81a8c8..6206f23f02 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_fence.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_fence.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image.hpp similarity index 97% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image.hpp index 492e5caf48..3b92774b86 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image.hpp @@ -11,7 +11,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image_view.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image_view.hpp similarity index 96% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image_view.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image_view.hpp index 4517fff102..869d35ac5c 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_image_view.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_image_view.hpp @@ -8,7 +8,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_imgui_context.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_imgui_context.hpp similarity index 82% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_imgui_context.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_imgui_context.hpp index 633bae3d09..07fde1dfcf 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_imgui_context.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_imgui_context.hpp @@ -6,10 +6,10 @@ #include "tactile/base/prelude.hpp" #include "tactile/base/util/scope_exit.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp" -#include "tactile/vulkan_renderer/vulkan_pipeline.hpp" -#include "tactile/vulkan_renderer/vulkan_pipeline_layout.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_descriptor_set_layout.hpp" +#include "tactile/vulkan/vulkan_pipeline.hpp" +#include "tactile/vulkan/vulkan_pipeline_layout.hpp" struct ImGui_ImplVulkan_InitInfo; struct ImGuiContext; diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_instance.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_instance.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_instance.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_instance.hpp index e22151a441..7465e11569 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_instance.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_instance.hpp @@ -8,7 +8,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_physical_device.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_physical_device.hpp similarity index 98% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_physical_device.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_physical_device.hpp index 2317bf4224..f7c2925761 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_physical_device.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_physical_device.hpp @@ -10,7 +10,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline.hpp similarity index 92% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline.hpp index cd641c3b03..771e41c84a 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline.hpp @@ -5,7 +5,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline_layout.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline_layout.hpp similarity index 92% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline_layout.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline_layout.hpp index 601688e08b..1e55af71ac 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_pipeline_layout.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_pipeline_layout.hpp @@ -5,7 +5,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer.hpp similarity index 80% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer.hpp index 2a9176f51d..0b1b0dd8c4 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer.hpp @@ -11,20 +11,20 @@ #include "tactile/base/id.hpp" #include "tactile/base/prelude.hpp" #include "tactile/base/render/renderer.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_allocator.hpp" -#include "tactile/vulkan_renderer/vulkan_command_buffer.hpp" -#include "tactile/vulkan_renderer/vulkan_command_pool.hpp" -#include "tactile/vulkan_renderer/vulkan_descriptor_pool.hpp" -#include "tactile/vulkan_renderer/vulkan_device.hpp" -#include "tactile/vulkan_renderer/vulkan_fence.hpp" -#include "tactile/vulkan_renderer/vulkan_imgui_context.hpp" -#include "tactile/vulkan_renderer/vulkan_instance.hpp" -#include "tactile/vulkan_renderer/vulkan_sampler.hpp" -#include "tactile/vulkan_renderer/vulkan_semaphore.hpp" -#include "tactile/vulkan_renderer/vulkan_surface.hpp" -#include "tactile/vulkan_renderer/vulkan_swapchain.hpp" -#include "tactile/vulkan_renderer/vulkan_texture.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_allocator.hpp" +#include "tactile/vulkan/vulkan_command_buffer.hpp" +#include "tactile/vulkan/vulkan_command_pool.hpp" +#include "tactile/vulkan/vulkan_descriptor_pool.hpp" +#include "tactile/vulkan/vulkan_device.hpp" +#include "tactile/vulkan/vulkan_fence.hpp" +#include "tactile/vulkan/vulkan_imgui_context.hpp" +#include "tactile/vulkan/vulkan_instance.hpp" +#include "tactile/vulkan/vulkan_sampler.hpp" +#include "tactile/vulkan/vulkan_semaphore.hpp" +#include "tactile/vulkan/vulkan_surface.hpp" +#include "tactile/vulkan/vulkan_swapchain.hpp" +#include "tactile/vulkan/vulkan_texture.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer_plugin.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer_plugin.hpp similarity index 87% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer_plugin.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer_plugin.hpp index 4e77e92f47..3982d4ab88 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_renderer_plugin.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_renderer_plugin.hpp @@ -7,8 +7,8 @@ #include "tactile/base/prelude.hpp" #include "tactile/base/util/scope_exit.hpp" #include "tactile/runtime/plugin.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_renderer.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_renderer.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_sampler.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_sampler.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_sampler.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_sampler.hpp index 474ac1224e..bb110bf8c7 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_sampler.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_sampler.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_semaphore.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_semaphore.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_semaphore.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_semaphore.hpp index 1ee8b86430..e97a5e380a 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_semaphore.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_semaphore.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_shader_module.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_shader_module.hpp similarity index 96% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_shader_module.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_shader_module.hpp index 0d1de94858..ddf1f45d5c 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_shader_module.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_shader_module.hpp @@ -9,7 +9,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_surface.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_surface.hpp similarity index 95% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_surface.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_surface.hpp index 861d419279..013c97ccfc 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_surface.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_surface.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_swapchain.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_swapchain.hpp similarity index 93% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_swapchain.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_swapchain.hpp index 066c245187..9f6d4ff503 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_swapchain.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_swapchain.hpp @@ -9,9 +9,9 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_image.hpp" -#include "tactile/vulkan_renderer/vulkan_image_view.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_image.hpp" +#include "tactile/vulkan/vulkan_image_view.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_texture.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_texture.hpp similarity index 93% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_texture.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_texture.hpp index 15ef51e9da..1b4ce0bac4 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_texture.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_texture.hpp @@ -10,8 +10,8 @@ #include "tactile/base/prelude.hpp" #include "tactile/base/render/texture.hpp" -#include "tactile/vulkan_renderer/api.hpp" -#include "tactile/vulkan_renderer/vulkan_image.hpp" +#include "tactile/vulkan/api.hpp" +#include "tactile/vulkan/vulkan_image.hpp" #include "vulkan_image_view.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_util.hpp b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_util.hpp similarity index 88% rename from source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_util.hpp rename to source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_util.hpp index 4531eccef2..b0a4fd01db 100644 --- a/source/vulkan_renderer/lib/inc/tactile/vulkan_renderer/vulkan_util.hpp +++ b/source/renderers/vulkan/lib/inc/tactile/vulkan/vulkan_util.hpp @@ -7,7 +7,7 @@ #include #include "tactile/base/prelude.hpp" -#include "tactile/vulkan_renderer/api.hpp" +#include "tactile/vulkan/api.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_allocator.cpp b/source/renderers/vulkan/lib/src/vulkan_allocator.cpp similarity index 94% rename from source/vulkan_renderer/lib/src/vulkan_allocator.cpp rename to source/renderers/vulkan/lib/src/vulkan_allocator.cpp index f9d8044633..3408f7c1da 100644 --- a/source/vulkan_renderer/lib/src/vulkan_allocator.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_allocator.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_allocator.hpp" +#include "tactile/vulkan/vulkan_allocator.hpp" #include // exchange @@ -8,7 +8,7 @@ #include #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_buffer.cpp b/source/renderers/vulkan/lib/src/vulkan_buffer.cpp similarity index 97% rename from source/vulkan_renderer/lib/src/vulkan_buffer.cpp rename to source/renderers/vulkan/lib/src/vulkan_buffer.cpp index 17fd11a318..155a24d1f5 100644 --- a/source/vulkan_renderer/lib/src/vulkan_buffer.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_buffer.cpp @@ -1,13 +1,13 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_buffer.hpp" +#include "tactile/vulkan/vulkan_buffer.hpp" #include // min #include // memcpy #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_command_buffer.cpp b/source/renderers/vulkan/lib/src/vulkan_command_buffer.cpp similarity index 94% rename from source/vulkan_renderer/lib/src/vulkan_command_buffer.cpp rename to source/renderers/vulkan/lib/src/vulkan_command_buffer.cpp index 4de4611e67..a594ceb723 100644 --- a/source/vulkan_renderer/lib/src/vulkan_command_buffer.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_command_buffer.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_command_buffer.hpp" +#include "tactile/vulkan/vulkan_command_buffer.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_command_pool.cpp b/source/renderers/vulkan/lib/src/vulkan_command_pool.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_command_pool.cpp rename to source/renderers/vulkan/lib/src/vulkan_command_pool.cpp index 8a5e7c8908..2c99657de2 100644 --- a/source/vulkan_renderer/lib/src/vulkan_command_pool.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_command_pool.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_command_pool.hpp" +#include "tactile/vulkan/vulkan_command_pool.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_descriptor_pool.cpp b/source/renderers/vulkan/lib/src/vulkan_descriptor_pool.cpp similarity index 94% rename from source/vulkan_renderer/lib/src/vulkan_descriptor_pool.cpp rename to source/renderers/vulkan/lib/src/vulkan_descriptor_pool.cpp index e317952f55..74f221c4ae 100644 --- a/source/vulkan_renderer/lib/src/vulkan_descriptor_pool.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_descriptor_pool.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_descriptor_pool.hpp" +#include "tactile/vulkan/vulkan_descriptor_pool.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_descriptor_set_layout.cpp b/source/renderers/vulkan/lib/src/vulkan_descriptor_set_layout.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_descriptor_set_layout.cpp rename to source/renderers/vulkan/lib/src/vulkan_descriptor_set_layout.cpp index 8afb0a1c4f..49bb5d5006 100644 --- a/source/vulkan_renderer/lib/src/vulkan_descriptor_set_layout.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_descriptor_set_layout.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_descriptor_set_layout.hpp" +#include "tactile/vulkan/vulkan_descriptor_set_layout.hpp" #include // exchange diff --git a/source/vulkan_renderer/lib/src/vulkan_device.cpp b/source/renderers/vulkan/lib/src/vulkan_device.cpp similarity index 96% rename from source/vulkan_renderer/lib/src/vulkan_device.cpp rename to source/renderers/vulkan/lib/src/vulkan_device.cpp index 2789d4b6b2..33e96180a1 100644 --- a/source/vulkan_renderer/lib/src/vulkan_device.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_device.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_device.hpp" +#include "tactile/vulkan/vulkan_device.hpp" #include // set #include // exchange @@ -8,8 +8,8 @@ #include "tactile/base/render/renderer_options.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_physical_device.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_physical_device.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_fence.cpp b/source/renderers/vulkan/lib/src/vulkan_fence.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_fence.cpp rename to source/renderers/vulkan/lib/src/vulkan_fence.cpp index 72f0350cdd..76759d40ba 100644 --- a/source/vulkan_renderer/lib/src/vulkan_fence.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_fence.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_fence.hpp" +#include "tactile/vulkan/vulkan_fence.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_image.cpp b/source/renderers/vulkan/lib/src/vulkan_image.cpp similarity index 98% rename from source/vulkan_renderer/lib/src/vulkan_image.cpp rename to source/renderers/vulkan/lib/src/vulkan_image.cpp index 50567aeb61..2153264b0c 100644 --- a/source/vulkan_renderer/lib/src/vulkan_image.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_image.cpp @@ -1,15 +1,15 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_image.hpp" +#include "tactile/vulkan/vulkan_image.hpp" #include // assert #include // unordered_map #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_buffer.hpp" -#include "tactile/vulkan_renderer/vulkan_command_pool.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_buffer.hpp" +#include "tactile/vulkan/vulkan_command_pool.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_image_view.cpp b/source/renderers/vulkan/lib/src/vulkan_image_view.cpp similarity index 95% rename from source/vulkan_renderer/lib/src/vulkan_image_view.cpp rename to source/renderers/vulkan/lib/src/vulkan_image_view.cpp index cb52518ed3..bf15a822d1 100644 --- a/source/vulkan_renderer/lib/src/vulkan_image_view.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_image_view.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_image_view.hpp" +#include "tactile/vulkan/vulkan_image_view.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_imgui_context.cpp b/source/renderers/vulkan/lib/src/vulkan_imgui_context.cpp similarity index 98% rename from source/vulkan_renderer/lib/src/vulkan_imgui_context.cpp rename to source/renderers/vulkan/lib/src/vulkan_imgui_context.cpp index 49c88652cb..52ba7afc72 100644 --- a/source/vulkan_renderer/lib/src/vulkan_imgui_context.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_imgui_context.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_imgui_context.hpp" +#include "tactile/vulkan/vulkan_imgui_context.hpp" #include // expected #include // move @@ -12,9 +12,9 @@ #include "tactile/base/render/window.hpp" #include "tactile/base/util/scope_exit.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/imgui_shader_code.hpp" -#include "tactile/vulkan_renderer/vulkan_shader_module.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/imgui_shader_code.hpp" +#include "tactile/vulkan/vulkan_shader_module.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_instance.cpp b/source/renderers/vulkan/lib/src/vulkan_instance.cpp similarity index 96% rename from source/vulkan_renderer/lib/src/vulkan_instance.cpp rename to source/renderers/vulkan/lib/src/vulkan_instance.cpp index 2318b05100..e0d622ea65 100644 --- a/source/vulkan_renderer/lib/src/vulkan_instance.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_instance.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_instance.hpp" +#include "tactile/vulkan/vulkan_instance.hpp" #include // uint32_t #include // vector @@ -10,7 +10,7 @@ #include "tactile/base/render/renderer_options.hpp" #include "tactile/base/render/window.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_physical_device.cpp b/source/renderers/vulkan/lib/src/vulkan_physical_device.cpp similarity index 98% rename from source/vulkan_renderer/lib/src/vulkan_physical_device.cpp rename to source/renderers/vulkan/lib/src/vulkan_physical_device.cpp index 024cc5aa67..15bf3f53a3 100644 --- a/source/vulkan_renderer/lib/src/vulkan_physical_device.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_physical_device.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_physical_device.hpp" +#include "tactile/vulkan/vulkan_physical_device.hpp" #include // sort, unique, max_element #include // unordered_map diff --git a/source/vulkan_renderer/lib/src/vulkan_pipeline.cpp b/source/renderers/vulkan/lib/src/vulkan_pipeline.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_pipeline.cpp rename to source/renderers/vulkan/lib/src/vulkan_pipeline.cpp index 150459a898..ebfb7e2cae 100644 --- a/source/vulkan_renderer/lib/src/vulkan_pipeline.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_pipeline.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_pipeline.hpp" +#include "tactile/vulkan/vulkan_pipeline.hpp" #include // exchange diff --git a/source/vulkan_renderer/lib/src/vulkan_pipeline_layout.cpp b/source/renderers/vulkan/lib/src/vulkan_pipeline_layout.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_pipeline_layout.cpp rename to source/renderers/vulkan/lib/src/vulkan_pipeline_layout.cpp index 7ff8b3a3f3..c636c3b59b 100644 --- a/source/vulkan_renderer/lib/src/vulkan_pipeline_layout.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_pipeline_layout.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_pipeline_layout.hpp" +#include "tactile/vulkan/vulkan_pipeline_layout.hpp" #include // exchange diff --git a/source/vulkan_renderer/lib/src/vulkan_renderer.cpp b/source/renderers/vulkan/lib/src/vulkan_renderer.cpp similarity index 98% rename from source/vulkan_renderer/lib/src/vulkan_renderer.cpp rename to source/renderers/vulkan/lib/src/vulkan_renderer.cpp index 2faeaf7aa3..45e96d4b95 100644 --- a/source/vulkan_renderer/lib/src/vulkan_renderer.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_renderer.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_renderer.hpp" +#include "tactile/vulkan/vulkan_renderer.hpp" #include // clamp #include // uint32_t, uint64_t @@ -17,9 +17,9 @@ #include "tactile/base/io/file_io.hpp" #include "tactile/base/render/window.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_buffer.hpp" -#include "tactile/vulkan_renderer/vulkan_physical_device.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_buffer.hpp" +#include "tactile/vulkan/vulkan_physical_device.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_renderer_plugin.cpp b/source/renderers/vulkan/lib/src/vulkan_renderer_plugin.cpp similarity index 96% rename from source/vulkan_renderer/lib/src/vulkan_renderer_plugin.cpp rename to source/renderers/vulkan/lib/src/vulkan_renderer_plugin.cpp index efb0aae2c5..387bf2c46e 100644 --- a/source/vulkan_renderer/lib/src/vulkan_renderer_plugin.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_renderer_plugin.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_renderer_plugin.hpp" +#include "tactile/vulkan/vulkan_renderer_plugin.hpp" #include // nothrow diff --git a/source/vulkan_renderer/lib/src/vulkan_sampler.cpp b/source/renderers/vulkan/lib/src/vulkan_sampler.cpp similarity index 96% rename from source/vulkan_renderer/lib/src/vulkan_sampler.cpp rename to source/renderers/vulkan/lib/src/vulkan_sampler.cpp index f373089749..9b26f2b22b 100644 --- a/source/vulkan_renderer/lib/src/vulkan_sampler.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_sampler.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_sampler.hpp" +#include "tactile/vulkan/vulkan_sampler.hpp" #include // exchange @@ -8,7 +8,7 @@ #include "tactile/base/render/renderer_options.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_semaphore.cpp b/source/renderers/vulkan/lib/src/vulkan_semaphore.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_semaphore.cpp rename to source/renderers/vulkan/lib/src/vulkan_semaphore.cpp index 48eb41d6b0..78a8f06378 100644 --- a/source/vulkan_renderer/lib/src/vulkan_semaphore.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_semaphore.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_semaphore.hpp" +#include "tactile/vulkan/vulkan_semaphore.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_shader_module.cpp b/source/renderers/vulkan/lib/src/vulkan_shader_module.cpp similarity index 93% rename from source/vulkan_renderer/lib/src/vulkan_shader_module.cpp rename to source/renderers/vulkan/lib/src/vulkan_shader_module.cpp index 4368d3078c..ea46bdb001 100644 --- a/source/vulkan_renderer/lib/src/vulkan_shader_module.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_shader_module.cpp @@ -1,11 +1,11 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_shader_module.hpp" +#include "tactile/vulkan/vulkan_shader_module.hpp" #include // exchange #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_surface.cpp b/source/renderers/vulkan/lib/src/vulkan_surface.cpp similarity index 96% rename from source/vulkan_renderer/lib/src/vulkan_surface.cpp rename to source/renderers/vulkan/lib/src/vulkan_surface.cpp index 5992e65491..dffb856c12 100644 --- a/source/vulkan_renderer/lib/src/vulkan_surface.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_surface.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_surface.hpp" +#include "tactile/vulkan/vulkan_surface.hpp" #include // exchange diff --git a/source/vulkan_renderer/lib/src/vulkan_swapchain.cpp b/source/renderers/vulkan/lib/src/vulkan_swapchain.cpp similarity index 98% rename from source/vulkan_renderer/lib/src/vulkan_swapchain.cpp rename to source/renderers/vulkan/lib/src/vulkan_swapchain.cpp index cc36d9e84a..47f667b2d5 100644 --- a/source/vulkan_renderer/lib/src/vulkan_swapchain.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_swapchain.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_swapchain.hpp" +#include "tactile/vulkan/vulkan_swapchain.hpp" #include // clamp #include // numeric_limits @@ -10,8 +10,8 @@ #include "tactile/base/render/renderer_options.hpp" #include "tactile/runtime/logging.hpp" -#include "tactile/vulkan_renderer/vulkan_physical_device.hpp" -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_physical_device.hpp" +#include "tactile/vulkan/vulkan_util.hpp" namespace tactile { namespace { diff --git a/source/vulkan_renderer/lib/src/vulkan_texture.cpp b/source/renderers/vulkan/lib/src/vulkan_texture.cpp similarity index 97% rename from source/vulkan_renderer/lib/src/vulkan_texture.cpp rename to source/renderers/vulkan/lib/src/vulkan_texture.cpp index baa4c7bc61..8bc2646926 100644 --- a/source/vulkan_renderer/lib/src/vulkan_texture.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_texture.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_texture.hpp" +#include "tactile/vulkan/vulkan_texture.hpp" #define STB_IMAGE_IMPLEMENTATION #include @@ -10,7 +10,7 @@ #include "tactile/base/numeric/saturate_cast.hpp" #include "tactile/base/render/renderer_options.hpp" #include "tactile/base/util/scope_exit.hpp" -#include "tactile/vulkan_renderer/vulkan_buffer.hpp" +#include "tactile/vulkan/vulkan_buffer.hpp" namespace tactile { diff --git a/source/vulkan_renderer/lib/src/vulkan_util.cpp b/source/renderers/vulkan/lib/src/vulkan_util.cpp similarity index 83% rename from source/vulkan_renderer/lib/src/vulkan_util.cpp rename to source/renderers/vulkan/lib/src/vulkan_util.cpp index a75654ec49..add36ee399 100644 --- a/source/vulkan_renderer/lib/src/vulkan_util.cpp +++ b/source/renderers/vulkan/lib/src/vulkan_util.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0) -#include "tactile/vulkan_renderer/vulkan_util.hpp" +#include "tactile/vulkan/vulkan_util.hpp" #include diff --git a/source/vulkan_renderer/shaders/imgui.frag b/source/renderers/vulkan/shaders/imgui.frag similarity index 100% rename from source/vulkan_renderer/shaders/imgui.frag rename to source/renderers/vulkan/shaders/imgui.frag diff --git a/source/vulkan_renderer/shaders/imgui.vert b/source/renderers/vulkan/shaders/imgui.vert similarity index 100% rename from source/vulkan_renderer/shaders/imgui.vert rename to source/renderers/vulkan/shaders/imgui.vert diff --git a/source/vulkan_renderer/test/.clang-tidy b/source/renderers/vulkan/test/.clang-tidy similarity index 100% rename from source/vulkan_renderer/test/.clang-tidy rename to source/renderers/vulkan/test/.clang-tidy diff --git a/source/vulkan_renderer/test/CMakeLists.txt b/source/renderers/vulkan/test/CMakeLists.txt similarity index 100% rename from source/vulkan_renderer/test/CMakeLists.txt rename to source/renderers/vulkan/test/CMakeLists.txt