From cd35a0ad76bdb07b361477fbf5dd0f701b968c09 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sun, 16 Apr 2023 16:51:52 +0200 Subject: [PATCH] More folder adjustments --- src/CMakeLists.txt | 10 ++++++---- .../vulkan/{ => accelstructs}/vk_raytrace.cpp | 0 .../rendering/vulkan/{ => accelstructs}/vk_raytrace.h | 0 src/common/rendering/vulkan/buffers/vk_buffer.cpp | 2 +- .../rendering/vulkan/{ => buffers}/vk_streambuffer.cpp | 4 ++-- .../rendering/vulkan/{ => buffers}/vk_streambuffer.h | 0 .../vulkan/descriptorsets/vk_descriptorset.cpp | 4 ++-- .../rendering/vulkan/pipelines/vk_renderpass.cpp | 2 +- src/common/rendering/vulkan/vk_renderdevice.cpp | 4 ++-- src/common/rendering/vulkan/vk_renderstate.h | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) rename src/common/rendering/vulkan/{ => accelstructs}/vk_raytrace.cpp (100%) rename src/common/rendering/vulkan/{ => accelstructs}/vk_raytrace.h (100%) rename src/common/rendering/vulkan/{ => buffers}/vk_streambuffer.cpp (98%) rename src/common/rendering/vulkan/{ => buffers}/vk_streambuffer.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b5f7d9755..cfe52065e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -595,6 +595,7 @@ file( GLOB HEADER_FILES common/rendering/vulkan/samplers/*.h common/rendering/vulkan/shaders/*.h common/rendering/vulkan/textures/*.h + common/rendering/vulkan/accelstructs/*.h common/scripting/core/*h common/scripting/vm/*h common/scripting/jit/*h @@ -734,24 +735,24 @@ set( FASTMATH_SOURCES set (VULKAN_SOURCES 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_streambuffer.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/samplers/vk_samplers.cpp common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp + common/rendering/vulkan/pipelines/vk_renderpass.cpp common/rendering/vulkan/shaders/vk_shader.cpp common/rendering/vulkan/shaders/vk_ppshader.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/framebuffers/vk_framebuffer.cpp + common/rendering/vulkan/accelstructs/vk_raytrace.cpp ) if (HAVE_VULKAN) @@ -1439,6 +1440,7 @@ source_group("Common\\Rendering\\Vulkan Renderer\\Pipelines" REGULAR_EXPRESSION 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\\Rendering\\Vulkan Renderer\\Accelstructs" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/accelstructs/.+") source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+") source_group("Common\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/.+") source_group("Common\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/textures/hires/.+") diff --git a/src/common/rendering/vulkan/vk_raytrace.cpp b/src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp similarity index 100% rename from src/common/rendering/vulkan/vk_raytrace.cpp rename to src/common/rendering/vulkan/accelstructs/vk_raytrace.cpp diff --git a/src/common/rendering/vulkan/vk_raytrace.h b/src/common/rendering/vulkan/accelstructs/vk_raytrace.h similarity index 100% rename from src/common/rendering/vulkan/vk_raytrace.h rename to src/common/rendering/vulkan/accelstructs/vk_raytrace.h diff --git a/src/common/rendering/vulkan/buffers/vk_buffer.cpp b/src/common/rendering/vulkan/buffers/vk_buffer.cpp index 547eee4bc..f9e94ee3f 100644 --- a/src/common/rendering/vulkan/buffers/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/vk_streambuffer.h" +#include "vk_streambuffer.h" #include "hwrenderer/data/shaderuniforms.h" VkBufferManager::VkBufferManager(VulkanRenderDevice* fb) : fb(fb) diff --git a/src/common/rendering/vulkan/vk_streambuffer.cpp b/src/common/rendering/vulkan/buffers/vk_streambuffer.cpp similarity index 98% rename from src/common/rendering/vulkan/vk_streambuffer.cpp rename to src/common/rendering/vulkan/buffers/vk_streambuffer.cpp index 99753d9ab..5432786ae 100644 --- a/src/common/rendering/vulkan/vk_streambuffer.cpp +++ b/src/common/rendering/vulkan/buffers/vk_streambuffer.cpp @@ -20,9 +20,9 @@ ** */ -#include "vk_renderstate.h" +#include "vk_streambuffer.h" +#include "vulkan/vk_renderstate.h" #include "vulkan/vk_renderdevice.h" -#include "vulkan/vk_streambuffer.h" #include "vulkan/buffers/vk_buffer.h" #include diff --git a/src/common/rendering/vulkan/vk_streambuffer.h b/src/common/rendering/vulkan/buffers/vk_streambuffer.h similarity index 100% rename from src/common/rendering/vulkan/vk_streambuffer.h rename to src/common/rendering/vulkan/buffers/vk_streambuffer.h diff --git a/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp index 09a96e4ba..e4e696348 100644 --- a/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp +++ b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp @@ -21,9 +21,8 @@ */ #include "vk_descriptorset.h" -#include "vulkan/vk_streambuffer.h" -#include "vulkan/vk_raytrace.h" #include "vulkan/vk_renderdevice.h" +#include "vulkan/accelstructs/vk_raytrace.h" #include "vulkan/shaders/vk_shader.h" #include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_renderbuffers.h" @@ -31,6 +30,7 @@ #include "vulkan/textures/vk_texture.h" #include "vulkan/buffers/vk_hwbuffer.h" #include "vulkan/buffers/vk_buffer.h" +#include "vulkan/buffers/vk_streambuffer.h" #include "vulkan/commands/vk_commandbuffer.h" #include #include "flatvertices.h" diff --git a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp index e47daf73d..4a4ca827d 100644 --- a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp +++ b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp @@ -22,8 +22,8 @@ #include "vk_renderpass.h" #include "vulkan/vk_renderstate.h" -#include "vulkan/vk_raytrace.h" #include "vulkan/vk_renderdevice.h" +#include "vulkan/accelstructs/vk_raytrace.h" #include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/samplers/vk_samplers.h" diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp index 204847fb9..6c65db5fb 100644 --- a/src/common/rendering/vulkan/vk_renderdevice.cpp +++ b/src/common/rendering/vulkan/vk_renderdevice.cpp @@ -45,9 +45,8 @@ #include "vk_renderdevice.h" #include "vulkan/vk_renderstate.h" -#include "vulkan/vk_streambuffer.h" #include "vulkan/vk_postprocess.h" -#include "vulkan/vk_raytrace.h" +#include "vulkan/accelstructs/vk_raytrace.h" #include "vulkan/pipelines/vk_renderpass.h" #include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/shaders/vk_shader.h" @@ -59,6 +58,7 @@ #include "vulkan/commands/vk_commandbuffer.h" #include "vulkan/buffers/vk_hwbuffer.h" #include "vulkan/buffers/vk_buffer.h" +#include "vulkan/buffers/vk_streambuffer.h" #include #include #include diff --git a/src/common/rendering/vulkan/vk_renderstate.h b/src/common/rendering/vulkan/vk_renderstate.h index 770a4e2a2..9a45c604d 100644 --- a/src/common/rendering/vulkan/vk_renderstate.h +++ b/src/common/rendering/vulkan/vk_renderstate.h @@ -2,9 +2,9 @@ #pragma once #include "vulkan/buffers/vk_hwbuffer.h" +#include "vulkan/buffers/vk_streambuffer.h" #include "vulkan/shaders/vk_shader.h" #include "vulkan/pipelines/vk_renderpass.h" -#include "vk_streambuffer.h" #include "name.h"