Skip to content

Commit

Permalink
Move Vulkan renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
@albin-johansson
albin-johansson committed Oct 8, 2024
1 parent eb67585 commit 3df9f56
Show file tree
Hide file tree
Showing 57 changed files with 123 additions and 123 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
2 changes: 1 addition & 1 deletion source/vulkan_renderer/CMakeLists.txt → source/renderers/vulkan/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project(tactile-vulkan-renderer CXX)
project(tactile-renderers-vulkan CXX)

find_package(SDL2 CONFIG REQUIRED)
find_package(Vulkan REQUIRED)
Expand Down
54 changes: 27 additions & 27 deletions source/vulkan_renderer/lib/CMakeLists.txt → source/renderers/vulkan/lib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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)
Expand Down
0 ...r/lib/inc/tactile/vulkan_renderer/api.hpp → ...ers/vulkan/lib/inc/tactile/vulkan/api.hpp
View file
File renamed without changes.
0 ...ile/vulkan_renderer/imgui_shader_code.hpp → .../inc/tactile/vulkan/imgui_shader_code.hpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tile/vulkan_renderer/vulkan_allocator.hpp → ...b/inc/tactile/vulkan/vulkan_allocator.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...tactile/vulkan_renderer/vulkan_buffer.hpp → .../lib/inc/tactile/vulkan/vulkan_buffer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...vulkan_renderer/vulkan_command_buffer.hpp → .../tactile/vulkan/vulkan_command_buffer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
4 changes: 2 additions & 2 deletions ...e/vulkan_renderer/vulkan_command_pool.hpp → ...nc/tactile/vulkan/vulkan_command_pool.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include <vulkan/vulkan.h>

#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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ulkan_renderer/vulkan_descriptor_pool.hpp → ...tactile/vulkan/vulkan_descriptor_pool.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...renderer/vulkan_descriptor_set_layout.hpp → ...e/vulkan/vulkan_descriptor_set_layout.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...tactile/vulkan_renderer/vulkan_device.hpp → .../lib/inc/tactile/vulkan/vulkan_device.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion .../tactile/vulkan_renderer/vulkan_fence.hpp → ...n/lib/inc/tactile/vulkan/vulkan_fence.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion .../tactile/vulkan_renderer/vulkan_image.hpp → ...n/lib/inc/tactile/vulkan/vulkan_image.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...ile/vulkan_renderer/vulkan_image_view.hpp → .../inc/tactile/vulkan/vulkan_image_view.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
8 changes: 4 additions & 4 deletions .../vulkan_renderer/vulkan_imgui_context.hpp → ...c/tactile/vulkan/vulkan_imgui_context.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ctile/vulkan_renderer/vulkan_instance.hpp → ...ib/inc/tactile/vulkan/vulkan_instance.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...ulkan_renderer/vulkan_physical_device.hpp → ...tactile/vulkan/vulkan_physical_device.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...ctile/vulkan_renderer/vulkan_pipeline.hpp → ...ib/inc/tactile/vulkan/vulkan_pipeline.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...ulkan_renderer/vulkan_pipeline_layout.hpp → ...tactile/vulkan/vulkan_pipeline_layout.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
28 changes: 14 additions & 14 deletions ...ctile/vulkan_renderer/vulkan_renderer.hpp → ...ib/inc/tactile/vulkan/vulkan_renderer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...ulkan_renderer/vulkan_renderer_plugin.hpp → ...tactile/vulkan/vulkan_renderer_plugin.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...actile/vulkan_renderer/vulkan_sampler.hpp → ...lib/inc/tactile/vulkan/vulkan_sampler.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...tile/vulkan_renderer/vulkan_semaphore.hpp → ...b/inc/tactile/vulkan/vulkan_semaphore.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion .../vulkan_renderer/vulkan_shader_module.hpp → ...c/tactile/vulkan/vulkan_shader_module.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
2 changes: 1 addition & 1 deletion ...actile/vulkan_renderer/vulkan_surface.hpp → ...lib/inc/tactile/vulkan/vulkan_surface.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
6 changes: 3 additions & 3 deletions ...tile/vulkan_renderer/vulkan_swapchain.hpp → ...b/inc/tactile/vulkan/vulkan_swapchain.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#include <vulkan/vulkan.h>

#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 {

Expand Down
4 changes: 2 additions & 2 deletions ...actile/vulkan_renderer/vulkan_texture.hpp → ...lib/inc/tactile/vulkan/vulkan_texture.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...c/tactile/vulkan_renderer/vulkan_util.hpp → ...an/lib/inc/tactile/vulkan/vulkan_util.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <vulkan/vulkan.h>

#include "tactile/base/prelude.hpp"
#include "tactile/vulkan_renderer/api.hpp"
#include "tactile/vulkan/api.hpp"

namespace tactile {

Expand Down
4 changes: 2 additions & 2 deletions ...kan_renderer/lib/src/vulkan_allocator.cpp → ...erers/vulkan/lib/src/vulkan_allocator.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// 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 <utility> // exchange

#define VMA_IMPLEMENTATION
#include <vk_mem_alloc.h>

#include "tactile/runtime/logging.hpp"
#include "tactile/vulkan_renderer/vulkan_util.hpp"
#include "tactile/vulkan/vulkan_util.hpp"

namespace tactile {

Expand Down
4 changes: 2 additions & 2 deletions ...vulkan_renderer/lib/src/vulkan_buffer.cpp → ...enderers/vulkan/lib/src/vulkan_buffer.cpp
View file
Original file line number Diff line number Diff line change
@@ -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 <algorithm> // min
#include <cstring> // memcpy
#include <utility> // exchange

#include "tactile/runtime/logging.hpp"
#include "tactile/vulkan_renderer/vulkan_util.hpp"
#include "tactile/vulkan/vulkan_util.hpp"

namespace tactile {

Expand Down
4 changes: 2 additions & 2 deletions ...enderer/lib/src/vulkan_command_buffer.cpp → .../vulkan/lib/src/vulkan_command_buffer.cpp
View file
Original file line number Diff line number Diff line change
@@ -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 <utility> // exchange

#include "tactile/runtime/logging.hpp"
#include "tactile/vulkan_renderer/vulkan_util.hpp"
#include "tactile/vulkan/vulkan_util.hpp"

namespace tactile {

Expand Down
4 changes: 2 additions & 2 deletions ..._renderer/lib/src/vulkan_command_pool.cpp → ...rs/vulkan/lib/src/vulkan_command_pool.cpp
View file
Original file line number Diff line number Diff line change
@@ -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 <utility> // exchange

#include "tactile/runtime/logging.hpp"
#include "tactile/vulkan_renderer/vulkan_util.hpp"
#include "tactile/vulkan/vulkan_util.hpp"

namespace tactile {

Expand Down
Loading

0 comments on commit 3df9f56

Please sign in to comment.