From 295eb252abb0b2000873782351b2b63a4efde2d6 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 16 Apr 2023 16:39:15 +0200 Subject: [PATCH] Change the folder structure of the vulkan backend to better reflect what is going on --- src/CMakeLists.txt | 43 +++++++++++-------- src/common/platform/posix/cocoa/i_video.mm | 2 +- src/common/platform/posix/sdl/sdlglvideo.cpp | 2 +- src/common/platform/win32/win32vulkanvideo.h | 2 +- .../vulkan/{system => buffers}/vk_buffer.cpp | 2 +- .../vulkan/{system => buffers}/vk_buffer.h | 0 .../{system => buffers}/vk_hwbuffer.cpp | 10 ++--- .../vulkan/{system => buffers}/vk_hwbuffer.h | 0 .../{system => commands}/vk_commandbuffer.cpp | 12 +++--- .../{system => commands}/vk_commandbuffer.h | 0 .../vk_descriptorset.cpp | 14 +++--- .../vk_descriptorset.h | 0 .../vk_framebuffer.cpp | 4 +- .../vk_framebuffer.h | 0 .../{renderer => pipelines}/vk_renderpass.cpp | 12 +++--- .../{renderer => pipelines}/vk_renderpass.h | 0 .../{textures => samplers}/vk_samplers.cpp | 4 +- .../{textures => samplers}/vk_samplers.h | 0 .../rendering/vulkan/shaders/vk_ppshader.cpp | 6 +-- .../rendering/vulkan/shaders/vk_shader.cpp | 4 +- .../vulkan/textures/vk_hwtexture.cpp | 10 ++--- .../vulkan/textures/vk_imagetransition.h | 6 +-- .../vulkan/textures/vk_pptexture.cpp | 4 +- .../vulkan/textures/vk_renderbuffers.cpp | 8 ++-- .../rendering/vulkan/textures/vk_texture.cpp | 2 +- .../vulkan/{renderer => }/vk_postprocess.cpp | 12 +++--- .../vulkan/{renderer => }/vk_postprocess.h | 0 .../{renderer => }/vk_pprenderstate.cpp | 16 +++---- .../vulkan/{renderer => }/vk_pprenderstate.h | 0 .../vulkan/{renderer => }/vk_raytrace.cpp | 4 +- .../vulkan/{renderer => }/vk_raytrace.h | 0 .../vulkan/{system => }/vk_renderdevice.cpp | 22 +++++----- .../vulkan/{system => }/vk_renderdevice.h | 0 .../vulkan/{renderer => }/vk_renderstate.cpp | 12 +++--- .../vulkan/{renderer => }/vk_renderstate.h | 6 +-- .../vulkan/{renderer => }/vk_streambuffer.cpp | 8 ++-- .../vulkan/{renderer => }/vk_streambuffer.h | 2 +- 37 files changed, 119 insertions(+), 110 deletions(-) rename src/common/rendering/vulkan/{system => buffers}/vk_buffer.cpp (98%) rename src/common/rendering/vulkan/{system => buffers}/vk_buffer.h (100%) rename src/common/rendering/vulkan/{system => buffers}/vk_hwbuffer.cpp (97%) rename src/common/rendering/vulkan/{system => buffers}/vk_hwbuffer.h (100%) rename src/common/rendering/vulkan/{system => commands}/vk_commandbuffer.cpp (96%) rename src/common/rendering/vulkan/{system => commands}/vk_commandbuffer.h (100%) rename src/common/rendering/vulkan/{renderer => descriptorsets}/vk_descriptorset.cpp (97%) rename src/common/rendering/vulkan/{renderer => descriptorsets}/vk_descriptorset.h (100%) rename src/common/rendering/vulkan/{textures => framebuffers}/vk_framebuffer.cpp (96%) rename src/common/rendering/vulkan/{textures => framebuffers}/vk_framebuffer.h (100%) rename src/common/rendering/vulkan/{renderer => pipelines}/vk_renderpass.cpp (98%) rename src/common/rendering/vulkan/{renderer => pipelines}/vk_renderpass.h (100%) rename src/common/rendering/vulkan/{textures => samplers}/vk_samplers.cpp (98%) rename src/common/rendering/vulkan/{textures => samplers}/vk_samplers.h (100%) rename src/common/rendering/vulkan/{renderer => }/vk_postprocess.cpp (97%) rename src/common/rendering/vulkan/{renderer => }/vk_postprocess.h (100%) rename src/common/rendering/vulkan/{renderer => }/vk_pprenderstate.cpp (94%) rename src/common/rendering/vulkan/{renderer => }/vk_pprenderstate.h (100%) rename src/common/rendering/vulkan/{renderer => }/vk_raytrace.cpp (99%) rename src/common/rendering/vulkan/{renderer => }/vk_raytrace.h (100%) rename src/common/rendering/vulkan/{system => }/vk_renderdevice.cpp (97%) rename src/common/rendering/vulkan/{system => }/vk_renderdevice.h (100%) rename src/common/rendering/vulkan/{renderer => }/vk_renderstate.cpp (98%) rename src/common/rendering/vulkan/{renderer => }/vk_renderstate.h (96%) rename src/common/rendering/vulkan/{renderer => }/vk_streambuffer.cpp (95%) rename src/common/rendering/vulkan/{renderer => }/vk_streambuffer.h (95%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8902ced5a..b5f7d9755 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -587,8 +587,12 @@ file( GLOB HEADER_FILES common/rendering/*.h common/rendering/hwrenderer/data/*.h common/rendering/vulkan/*.h - common/rendering/vulkan/system/*.h - common/rendering/vulkan/renderer/*.h + common/rendering/vulkan/buffers/*.h + common/rendering/vulkan/commands/*.h + common/rendering/vulkan/descriptorsets/*.h + common/rendering/vulkan/framebuffers/*.h + common/rendering/vulkan/pipelines/*.h + common/rendering/vulkan/samplers/*.h common/rendering/vulkan/shaders/*.h common/rendering/vulkan/textures/*.h common/scripting/core/*h @@ -728,26 +732,26 @@ set( FASTMATH_SOURCES #Vulkan stuff must go into a separate list because it needs to be disabled for some platforms set (VULKAN_SOURCES - common/rendering/vulkan/system/vk_renderdevice.cpp - common/rendering/vulkan/system/vk_commandbuffer.cpp - common/rendering/vulkan/system/vk_hwbuffer.cpp - common/rendering/vulkan/system/vk_buffer.cpp - common/rendering/vulkan/renderer/vk_renderstate.cpp - common/rendering/vulkan/renderer/vk_renderpass.cpp - common/rendering/vulkan/renderer/vk_streambuffer.cpp - common/rendering/vulkan/renderer/vk_postprocess.cpp - common/rendering/vulkan/renderer/vk_pprenderstate.cpp - common/rendering/vulkan/renderer/vk_descriptorset.cpp - common/rendering/vulkan/renderer/vk_raytrace.cpp + common/rendering/vulkan/vk_renderdevice.cpp + common/rendering/vulkan/vk_renderstate.cpp + common/rendering/vulkan/vk_streambuffer.cpp + common/rendering/vulkan/vk_postprocess.cpp + common/rendering/vulkan/vk_pprenderstate.cpp + common/rendering/vulkan/vk_raytrace.cpp + common/rendering/vulkan/commands/vk_commandbuffer.cpp + common/rendering/vulkan/buffers/vk_hwbuffer.cpp + common/rendering/vulkan/buffers/vk_buffer.cpp + common/rendering/vulkan/pipelines/vk_renderpass.cpp + common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp common/rendering/vulkan/shaders/vk_shader.cpp common/rendering/vulkan/shaders/vk_ppshader.cpp - common/rendering/vulkan/textures/vk_samplers.cpp + common/rendering/vulkan/samplers/vk_samplers.cpp common/rendering/vulkan/textures/vk_hwtexture.cpp common/rendering/vulkan/textures/vk_pptexture.cpp common/rendering/vulkan/textures/vk_imagetransition.cpp common/rendering/vulkan/textures/vk_renderbuffers.cpp common/rendering/vulkan/textures/vk_texture.cpp - common/rendering/vulkan/textures/vk_framebuffer.cpp + common/rendering/vulkan/framebuffers/vk_framebuffer.cpp ) if (HAVE_VULKAN) @@ -1426,8 +1430,13 @@ source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+") source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+") source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+") -source_group("Common\\Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/system/.+") -source_group("Common\\Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/renderer/.+") +source_group("Common\\Rendering\\Vulkan Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Buffers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/buffers/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Commands" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/commands/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Descriptorsets" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/descriptorsets/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Framebuffers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/framebuffers/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Pipelines" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/pipelines/.+") +source_group("Common\\Rendering\\Vulkan Renderer\\Samplers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/samplers/.+") source_group("Common\\Rendering\\Vulkan Renderer\\Shaders" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/shaders/.+") source_group("Common\\Rendering\\Vulkan Renderer\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/textures/.+") source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+") diff --git a/src/common/platform/posix/cocoa/i_video.mm b/src/common/platform/posix/cocoa/i_video.mm index 7c3c64732..741e70fea 100644 --- a/src/common/platform/posix/cocoa/i_video.mm +++ b/src/common/platform/posix/cocoa/i_video.mm @@ -51,7 +51,7 @@ #include "printf.h" #ifdef HAVE_VULKAN -#include "vulkan/system/vk_renderdevice.h" +#include "vulkan/vk_renderdevice.h" #endif bool I_CreateVulkanSurface(VkInstance instance, VkSurfaceKHR *surface); diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp index 5a1812f43..f1271aac6 100644 --- a/src/common/platform/posix/sdl/sdlglvideo.cpp +++ b/src/common/platform/posix/sdl/sdlglvideo.cpp @@ -47,7 +47,7 @@ #include "hardware.h" #ifdef HAVE_VULKAN -#include "vulkan/system/vk_renderdevice.h" +#include "vulkan/vk_renderdevice.h" #include #include #include diff --git a/src/common/platform/win32/win32vulkanvideo.h b/src/common/platform/win32/win32vulkanvideo.h index 1cd070f2a..611800478 100644 --- a/src/common/platform/win32/win32vulkanvideo.h +++ b/src/common/platform/win32/win32vulkanvideo.h @@ -2,7 +2,7 @@ #include "win32basevideo.h" #include "c_cvars.h" -#include "vulkan/system/vk_renderdevice.h" +#include "vulkan/vk_renderdevice.h" #include #include diff --git a/src/common/rendering/vulkan/system/vk_buffer.cpp b/src/common/rendering/vulkan/buffers/vk_buffer.cpp similarity index 98% rename from src/common/rendering/vulkan/system/vk_buffer.cpp rename to src/common/rendering/vulkan/buffers/vk_buffer.cpp index cc1d04387..547eee4bc 100644 --- a/src/common/rendering/vulkan/system/vk_buffer.cpp +++ b/src/common/rendering/vulkan/buffers/vk_buffer.cpp @@ -22,7 +22,7 @@ #include "vk_buffer.h" #include "vk_hwbuffer.h" -#include "vulkan/renderer/vk_streambuffer.h" +#include "vulkan/vk_streambuffer.h" #include "hwrenderer/data/shaderuniforms.h" VkBufferManager::VkBufferManager(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/system/vk_buffer.h b/src/common/rendering/vulkan/buffers/vk_buffer.h similarity index 100% rename from src/common/rendering/vulkan/system/vk_buffer.h rename to src/common/rendering/vulkan/buffers/vk_buffer.h diff --git a/src/common/rendering/vulkan/system/vk_hwbuffer.cpp b/src/common/rendering/vulkan/buffers/vk_hwbuffer.cpp similarity index 97% rename from src/common/rendering/vulkan/system/vk_hwbuffer.cpp rename to src/common/rendering/vulkan/buffers/vk_hwbuffer.cpp index 7edfd471a..408fbfb4f 100644 --- a/src/common/rendering/vulkan/system/vk_hwbuffer.cpp +++ b/src/common/rendering/vulkan/buffers/vk_hwbuffer.cpp @@ -21,12 +21,12 @@ */ #include "vk_hwbuffer.h" -#include "zvulkan/vulkanbuilders.h" -#include "vk_renderdevice.h" -#include "vk_commandbuffer.h" #include "vk_buffer.h" -#include "vulkan/renderer/vk_renderstate.h" -#include "vulkan/renderer/vk_descriptorset.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" +#include #include "engineerrors.h" VkHardwareBuffer::VkHardwareBuffer(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/system/vk_hwbuffer.h b/src/common/rendering/vulkan/buffers/vk_hwbuffer.h similarity index 100% rename from src/common/rendering/vulkan/system/vk_hwbuffer.h rename to src/common/rendering/vulkan/buffers/vk_hwbuffer.h diff --git a/src/common/rendering/vulkan/system/vk_commandbuffer.cpp b/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp similarity index 96% rename from src/common/rendering/vulkan/system/vk_commandbuffer.cpp rename to src/common/rendering/vulkan/commands/vk_commandbuffer.cpp index 41dc568e5..e4899a67a 100644 --- a/src/common/rendering/vulkan/system/vk_commandbuffer.cpp +++ b/src/common/rendering/vulkan/commands/vk_commandbuffer.cpp @@ -21,12 +21,12 @@ */ #include "vk_commandbuffer.h" -#include "vk_renderdevice.h" -#include "zvulkan/vulkanswapchain.h" -#include "zvulkan/vulkanbuilders.h" -#include "vulkan/textures/vk_framebuffer.h" -#include "vulkan/renderer/vk_renderstate.h" -#include "vulkan/renderer/vk_postprocess.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/vk_postprocess.h" +#include "vulkan/framebuffers/vk_framebuffer.h" +#include +#include #include "hw_clock.h" #include "v_video.h" diff --git a/src/common/rendering/vulkan/system/vk_commandbuffer.h b/src/common/rendering/vulkan/commands/vk_commandbuffer.h similarity index 100% rename from src/common/rendering/vulkan/system/vk_commandbuffer.h rename to src/common/rendering/vulkan/commands/vk_commandbuffer.h diff --git a/src/common/rendering/vulkan/renderer/vk_descriptorset.cpp b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp similarity index 97% rename from src/common/rendering/vulkan/renderer/vk_descriptorset.cpp rename to src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp index 18f7ac29a..09a96e4ba 100644 --- a/src/common/rendering/vulkan/renderer/vk_descriptorset.cpp +++ b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp @@ -21,18 +21,18 @@ */ #include "vk_descriptorset.h" -#include "vk_streambuffer.h" -#include "vk_raytrace.h" +#include "vulkan/vk_streambuffer.h" +#include "vulkan/vk_raytrace.h" +#include "vulkan/vk_renderdevice.h" #include "vulkan/shaders/vk_shader.h" -#include "vulkan/textures/vk_samplers.h" +#include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_hwtexture.h" #include "vulkan/textures/vk_texture.h" +#include "vulkan/buffers/vk_hwbuffer.h" +#include "vulkan/buffers/vk_buffer.h" +#include "vulkan/commands/vk_commandbuffer.h" #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_hwbuffer.h" -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/system/vk_buffer.h" #include "flatvertices.h" #include "hw_viewpointuniforms.h" #include "v_2ddrawer.h" diff --git a/src/common/rendering/vulkan/renderer/vk_descriptorset.h b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.h similarity index 100% rename from src/common/rendering/vulkan/renderer/vk_descriptorset.h rename to src/common/rendering/vulkan/descriptorsets/vk_descriptorset.h diff --git a/src/common/rendering/vulkan/textures/vk_framebuffer.cpp b/src/common/rendering/vulkan/framebuffers/vk_framebuffer.cpp similarity index 96% rename from src/common/rendering/vulkan/textures/vk_framebuffer.cpp rename to src/common/rendering/vulkan/framebuffers/vk_framebuffer.cpp index c32e73b9d..112a78cf1 100644 --- a/src/common/rendering/vulkan/textures/vk_framebuffer.cpp +++ b/src/common/rendering/vulkan/framebuffers/vk_framebuffer.cpp @@ -24,8 +24,8 @@ #include #include #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/renderer/vk_postprocess.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_postprocess.h" #include "vk_framebuffer.h" CVAR(Bool, vk_hdr, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); diff --git a/src/common/rendering/vulkan/textures/vk_framebuffer.h b/src/common/rendering/vulkan/framebuffers/vk_framebuffer.h similarity index 100% rename from src/common/rendering/vulkan/textures/vk_framebuffer.h rename to src/common/rendering/vulkan/framebuffers/vk_framebuffer.h diff --git a/src/common/rendering/vulkan/renderer/vk_renderpass.cpp b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp similarity index 98% rename from src/common/rendering/vulkan/renderer/vk_renderpass.cpp rename to src/common/rendering/vulkan/pipelines/vk_renderpass.cpp index fd3c1e37a..e47daf73d 100644 --- a/src/common/rendering/vulkan/renderer/vk_renderpass.cpp +++ b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp @@ -21,16 +21,16 @@ */ #include "vk_renderpass.h" -#include "vk_renderstate.h" -#include "vk_descriptorset.h" -#include "vk_raytrace.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/vk_raytrace.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/textures/vk_renderbuffers.h" -#include "vulkan/textures/vk_samplers.h" +#include "vulkan/samplers/vk_samplers.h" #include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_ppshader.h" +#include "vulkan/buffers/vk_hwbuffer.h" #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_hwbuffer.h" #include "flatvertices.h" #include "hw_viewpointuniforms.h" #include "v_2ddrawer.h" diff --git a/src/common/rendering/vulkan/renderer/vk_renderpass.h b/src/common/rendering/vulkan/pipelines/vk_renderpass.h similarity index 100% rename from src/common/rendering/vulkan/renderer/vk_renderpass.h rename to src/common/rendering/vulkan/pipelines/vk_renderpass.h diff --git a/src/common/rendering/vulkan/textures/vk_samplers.cpp b/src/common/rendering/vulkan/samplers/vk_samplers.cpp similarity index 98% rename from src/common/rendering/vulkan/textures/vk_samplers.cpp rename to src/common/rendering/vulkan/samplers/vk_samplers.cpp index 1ce86fea0..bfb6ffb94 100644 --- a/src/common/rendering/vulkan/textures/vk_samplers.cpp +++ b/src/common/rendering/vulkan/samplers/vk_samplers.cpp @@ -26,8 +26,8 @@ #include "c_cvars.h" #include "v_video.h" #include "hw_cvars.h" -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" #include "vk_samplers.h" #include "hw_material.h" #include "i_interface.h" diff --git a/src/common/rendering/vulkan/textures/vk_samplers.h b/src/common/rendering/vulkan/samplers/vk_samplers.h similarity index 100% rename from src/common/rendering/vulkan/textures/vk_samplers.h rename to src/common/rendering/vulkan/samplers/vk_samplers.h diff --git a/src/common/rendering/vulkan/shaders/vk_ppshader.cpp b/src/common/rendering/vulkan/shaders/vk_ppshader.cpp index c8966e5b1..d2b35880a 100644 --- a/src/common/rendering/vulkan/shaders/vk_ppshader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_ppshader.cpp @@ -22,9 +22,9 @@ #include "vk_ppshader.h" #include "vk_shader.h" -#include "vulkan/system/vk_renderdevice.h" -#include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_commandbuffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include #include "filesystem.h" VkPPShader::VkPPShader(VulkanRenderDevice* fb, PPShader *shader) : fb(fb) diff --git a/src/common/rendering/vulkan/shaders/vk_shader.cpp b/src/common/rendering/vulkan/shaders/vk_shader.cpp index 7388aee92..9ecaf5d2d 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -22,8 +22,8 @@ #include "vk_shader.h" #include "vk_ppshader.h" -#include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_renderdevice.h" +#include "vulkan/vk_renderdevice.h" +#include #include "hw_shaderpatcher.h" #include "filesystem.h" #include "engineerrors.h" diff --git a/src/common/rendering/vulkan/textures/vk_hwtexture.cpp b/src/common/rendering/vulkan/textures/vk_hwtexture.cpp index b42a45a19..ce50de094 100644 --- a/src/common/rendering/vulkan/textures/vk_hwtexture.cpp +++ b/src/common/rendering/vulkan/textures/vk_hwtexture.cpp @@ -27,13 +27,13 @@ #include "hw_renderstate.h" #include #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/textures/vk_samplers.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_postprocess.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_texture.h" -#include "vulkan/renderer/vk_descriptorset.h" -#include "vulkan/renderer/vk_postprocess.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/shaders/vk_shader.h" #include "vk_hwtexture.h" diff --git a/src/common/rendering/vulkan/textures/vk_imagetransition.h b/src/common/rendering/vulkan/textures/vk_imagetransition.h index 9f1194bbf..3dd78a48b 100644 --- a/src/common/rendering/vulkan/textures/vk_imagetransition.h +++ b/src/common/rendering/vulkan/textures/vk_imagetransition.h @@ -3,9 +3,9 @@ #include "zvulkan/vulkanobjects.h" #include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/renderer/vk_renderpass.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/pipelines/vk_renderpass.h" class VkTextureImage { diff --git a/src/common/rendering/vulkan/textures/vk_pptexture.cpp b/src/common/rendering/vulkan/textures/vk_pptexture.cpp index 94114d4b6..74a0ae11e 100644 --- a/src/common/rendering/vulkan/textures/vk_pptexture.cpp +++ b/src/common/rendering/vulkan/textures/vk_pptexture.cpp @@ -22,8 +22,8 @@ #include "vk_pptexture.h" #include "vk_texture.h" -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" VkPPTexture::VkPPTexture(VulkanRenderDevice* fb, PPTexture *texture) : fb(fb) { diff --git a/src/common/rendering/vulkan/textures/vk_renderbuffers.cpp b/src/common/rendering/vulkan/textures/vk_renderbuffers.cpp index 474934e67..9caa58887 100644 --- a/src/common/rendering/vulkan/textures/vk_renderbuffers.cpp +++ b/src/common/rendering/vulkan/textures/vk_renderbuffers.cpp @@ -21,14 +21,14 @@ */ #include "vk_renderbuffers.h" -#include "vulkan/renderer/vk_postprocess.h" +#include "vulkan/vk_postprocess.h" +#include "vulkan/vk_renderdevice.h" #include "vulkan/textures/vk_texture.h" -#include "vulkan/textures/vk_framebuffer.h" +#include "vulkan/framebuffers/vk_framebuffer.h" #include "vulkan/shaders/vk_shader.h" +#include "vulkan/commands/vk_commandbuffer.h" #include #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" #include "hw_cvars.h" VkRenderBuffers::VkRenderBuffers(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/textures/vk_texture.cpp b/src/common/rendering/vulkan/textures/vk_texture.cpp index b7d88a08a..19b3b99c8 100644 --- a/src/common/rendering/vulkan/textures/vk_texture.cpp +++ b/src/common/rendering/vulkan/textures/vk_texture.cpp @@ -24,7 +24,7 @@ #include "vk_hwtexture.h" #include "vk_pptexture.h" #include "vk_renderbuffers.h" -#include "vulkan/renderer/vk_postprocess.h" +#include "vulkan/vk_postprocess.h" #include "hw_cvars.h" VkTextureManager::VkTextureManager(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/renderer/vk_postprocess.cpp b/src/common/rendering/vulkan/vk_postprocess.cpp similarity index 97% rename from src/common/rendering/vulkan/renderer/vk_postprocess.cpp rename to src/common/rendering/vulkan/vk_postprocess.cpp index 20ca83fd6..d6fff706c 100644 --- a/src/common/rendering/vulkan/renderer/vk_postprocess.cpp +++ b/src/common/rendering/vulkan/vk_postprocess.cpp @@ -24,17 +24,17 @@ #include "vulkan/shaders/vk_shader.h" #include #include -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_hwbuffer.h" -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/renderer/vk_renderstate.h" -#include "vulkan/renderer/vk_pprenderstate.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/buffers/vk_hwbuffer.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/vk_pprenderstate.h" #include "vulkan/shaders/vk_ppshader.h" #include "vulkan/textures/vk_pptexture.h" #include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_imagetransition.h" #include "vulkan/textures/vk_texture.h" -#include "vulkan/textures/vk_framebuffer.h" +#include "vulkan/framebuffers/vk_framebuffer.h" #include "hw_cvars.h" #include "hwrenderer/postprocessing/hw_postprocess.h" #include "hwrenderer/postprocessing/hw_postprocess_cvars.h" diff --git a/src/common/rendering/vulkan/renderer/vk_postprocess.h b/src/common/rendering/vulkan/vk_postprocess.h similarity index 100% rename from src/common/rendering/vulkan/renderer/vk_postprocess.h rename to src/common/rendering/vulkan/vk_postprocess.h diff --git a/src/common/rendering/vulkan/renderer/vk_pprenderstate.cpp b/src/common/rendering/vulkan/vk_pprenderstate.cpp similarity index 94% rename from src/common/rendering/vulkan/renderer/vk_pprenderstate.cpp rename to src/common/rendering/vulkan/vk_pprenderstate.cpp index 838ca3fe2..129c5c909 100644 --- a/src/common/rendering/vulkan/renderer/vk_pprenderstate.cpp +++ b/src/common/rendering/vulkan/vk_pprenderstate.cpp @@ -22,18 +22,18 @@ #include "vk_pprenderstate.h" #include "vk_postprocess.h" -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" -#include -#include "vulkan/system/vk_buffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/buffers/vk_buffer.h" #include "vulkan/shaders/vk_ppshader.h" #include "vulkan/textures/vk_pptexture.h" #include "vulkan/textures/vk_renderbuffers.h" -#include "vulkan/textures/vk_samplers.h" +#include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_texture.h" -#include "vulkan/textures/vk_framebuffer.h" -#include "vulkan/renderer/vk_renderstate.h" -#include "vulkan/renderer/vk_descriptorset.h" +#include "vulkan/framebuffers/vk_framebuffer.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" +#include #include "flatvertices.h" VkPPRenderState::VkPPRenderState(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/renderer/vk_pprenderstate.h b/src/common/rendering/vulkan/vk_pprenderstate.h similarity index 100% rename from src/common/rendering/vulkan/renderer/vk_pprenderstate.h rename to src/common/rendering/vulkan/vk_pprenderstate.h diff --git a/src/common/rendering/vulkan/renderer/vk_raytrace.cpp b/src/common/rendering/vulkan/vk_raytrace.cpp similarity index 99% rename from src/common/rendering/vulkan/renderer/vk_raytrace.cpp rename to src/common/rendering/vulkan/vk_raytrace.cpp index 961b16a5a..849b35a59 100644 --- a/src/common/rendering/vulkan/renderer/vk_raytrace.cpp +++ b/src/common/rendering/vulkan/vk_raytrace.cpp @@ -22,8 +22,8 @@ #include "vk_raytrace.h" #include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_renderdevice.h" -#include "vulkan/system/vk_commandbuffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" #include "hw_levelmesh.h" VkRaytrace::VkRaytrace(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/renderer/vk_raytrace.h b/src/common/rendering/vulkan/vk_raytrace.h similarity index 100% rename from src/common/rendering/vulkan/renderer/vk_raytrace.h rename to src/common/rendering/vulkan/vk_raytrace.h diff --git a/src/common/rendering/vulkan/system/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp similarity index 97% rename from src/common/rendering/vulkan/system/vk_renderdevice.cpp rename to src/common/rendering/vulkan/vk_renderdevice.cpp index cceda0b14..204847fb9 100644 --- a/src/common/rendering/vulkan/system/vk_renderdevice.cpp +++ b/src/common/rendering/vulkan/vk_renderdevice.cpp @@ -44,25 +44,25 @@ #include "hw_bonebuffer.h" #include "vk_renderdevice.h" -#include "vk_hwbuffer.h" -#include "vulkan/renderer/vk_renderstate.h" -#include "vulkan/renderer/vk_renderpass.h" -#include "vulkan/renderer/vk_descriptorset.h" -#include "vulkan/renderer/vk_streambuffer.h" -#include "vulkan/renderer/vk_postprocess.h" -#include "vulkan/renderer/vk_raytrace.h" +#include "vulkan/vk_renderstate.h" +#include "vulkan/vk_streambuffer.h" +#include "vulkan/vk_postprocess.h" +#include "vulkan/vk_raytrace.h" +#include "vulkan/pipelines/vk_renderpass.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/shaders/vk_shader.h" +#include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_renderbuffers.h" -#include "vulkan/textures/vk_samplers.h" #include "vulkan/textures/vk_hwtexture.h" #include "vulkan/textures/vk_texture.h" -#include "vulkan/textures/vk_framebuffer.h" +#include "vulkan/framebuffers/vk_framebuffer.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/buffers/vk_hwbuffer.h" +#include "vulkan/buffers/vk_buffer.h" #include #include #include #include -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/system/vk_buffer.h" #include "engineerrors.h" #include "c_dispatch.h" diff --git a/src/common/rendering/vulkan/system/vk_renderdevice.h b/src/common/rendering/vulkan/vk_renderdevice.h similarity index 100% rename from src/common/rendering/vulkan/system/vk_renderdevice.h rename to src/common/rendering/vulkan/vk_renderdevice.h diff --git a/src/common/rendering/vulkan/renderer/vk_renderstate.cpp b/src/common/rendering/vulkan/vk_renderstate.cpp similarity index 98% rename from src/common/rendering/vulkan/renderer/vk_renderstate.cpp rename to src/common/rendering/vulkan/vk_renderstate.cpp index 59440f341..e70850467 100644 --- a/src/common/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/src/common/rendering/vulkan/vk_renderstate.cpp @@ -21,14 +21,14 @@ */ #include "vk_renderstate.h" -#include "vulkan/system/vk_renderdevice.h" -#include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_commandbuffer.h" -#include "vulkan/system/vk_buffer.h" -#include "vulkan/renderer/vk_renderpass.h" -#include "vulkan/renderer/vk_descriptorset.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/commands/vk_commandbuffer.h" +#include "vulkan/buffers/vk_buffer.h" +#include "vulkan/pipelines/vk_renderpass.h" +#include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_hwtexture.h" +#include #include "hw_skydome.h" #include "hw_viewpointuniforms.h" diff --git a/src/common/rendering/vulkan/renderer/vk_renderstate.h b/src/common/rendering/vulkan/vk_renderstate.h similarity index 96% rename from src/common/rendering/vulkan/renderer/vk_renderstate.h rename to src/common/rendering/vulkan/vk_renderstate.h index cc2e0d908..770a4e2a2 100644 --- a/src/common/rendering/vulkan/renderer/vk_renderstate.h +++ b/src/common/rendering/vulkan/vk_renderstate.h @@ -1,10 +1,10 @@ #pragma once -#include "vulkan/system/vk_hwbuffer.h" +#include "vulkan/buffers/vk_hwbuffer.h" #include "vulkan/shaders/vk_shader.h" -#include "vulkan/renderer/vk_renderpass.h" -#include "vulkan/renderer/vk_streambuffer.h" +#include "vulkan/pipelines/vk_renderpass.h" +#include "vk_streambuffer.h" #include "name.h" diff --git a/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp b/src/common/rendering/vulkan/vk_streambuffer.cpp similarity index 95% rename from src/common/rendering/vulkan/renderer/vk_streambuffer.cpp rename to src/common/rendering/vulkan/vk_streambuffer.cpp index 0db0fb71a..99753d9ab 100644 --- a/src/common/rendering/vulkan/renderer/vk_streambuffer.cpp +++ b/src/common/rendering/vulkan/vk_streambuffer.cpp @@ -21,10 +21,10 @@ */ #include "vk_renderstate.h" -#include "vulkan/system/vk_renderdevice.h" -#include "zvulkan/vulkanbuilders.h" -#include "vulkan/system/vk_buffer.h" -#include "vulkan/renderer/vk_streambuffer.h" +#include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_streambuffer.h" +#include "vulkan/buffers/vk_buffer.h" +#include VkStreamBufferWriter::VkStreamBufferWriter(VulkanRenderDevice* fb) { diff --git a/src/common/rendering/vulkan/renderer/vk_streambuffer.h b/src/common/rendering/vulkan/vk_streambuffer.h similarity index 95% rename from src/common/rendering/vulkan/renderer/vk_streambuffer.h rename to src/common/rendering/vulkan/vk_streambuffer.h index 3bae01fb1..e0ab48450 100644 --- a/src/common/rendering/vulkan/renderer/vk_streambuffer.h +++ b/src/common/rendering/vulkan/vk_streambuffer.h @@ -1,7 +1,7 @@ #pragma once -#include "vulkan/system/vk_hwbuffer.h" +#include "vulkan/buffers/vk_hwbuffer.h" #include "vulkan/shaders/vk_shader.h" class VkStreamBuffer;