From ed7da1ae2565ba15898f5786e76de0cafb22a503 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 6 Dec 2023 14:11:13 +0100 Subject: [PATCH] Moving files --- src/CMakeLists.txt | 6 ++---- .../rendering/vulkan/descriptorsets/vk_descriptorset.cpp | 2 +- src/common/rendering/vulkan/pipelines/vk_renderpass.cpp | 2 +- .../rendering/vulkan/{accelstructs => }/vk_levelmesh.cpp | 0 .../rendering/vulkan/{accelstructs => }/vk_levelmesh.h | 0 .../rendering/vulkan/{accelstructs => }/vk_lightmapper.cpp | 0 .../rendering/vulkan/{accelstructs => }/vk_lightmapper.h | 0 src/common/rendering/vulkan/vk_renderdevice.cpp | 4 ++-- src/common/rendering/vulkan/vk_renderstate.cpp | 2 +- 9 files changed, 7 insertions(+), 9 deletions(-) rename src/common/rendering/vulkan/{accelstructs => }/vk_levelmesh.cpp (100%) rename src/common/rendering/vulkan/{accelstructs => }/vk_levelmesh.h (100%) rename src/common/rendering/vulkan/{accelstructs => }/vk_lightmapper.cpp (100%) rename src/common/rendering/vulkan/{accelstructs => }/vk_lightmapper.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a9f7d2ee3..889b4d611 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -605,7 +605,6 @@ 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 @@ -744,6 +743,8 @@ set (VULKAN_SOURCES common/rendering/vulkan/vk_renderstate.cpp common/rendering/vulkan/vk_postprocess.cpp common/rendering/vulkan/vk_pprenderstate.cpp + common/rendering/vulkan/vk_levelmesh.cpp + common/rendering/vulkan/vk_lightmapper.cpp common/rendering/vulkan/commands/vk_commandbuffer.cpp common/rendering/vulkan/buffers/vk_rsbuffers.cpp common/rendering/vulkan/buffers/vk_hwbuffer.cpp @@ -760,8 +761,6 @@ set (VULKAN_SOURCES 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_levelmesh.cpp - common/rendering/vulkan/accelstructs/vk_lightmapper.cpp ) if (HAVE_VULKAN) @@ -1466,7 +1465,6 @@ 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/descriptorsets/vk_descriptorset.cpp b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp index 11ff57252..218d17ea5 100644 --- a/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp +++ b/src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp @@ -22,7 +22,7 @@ #include "vk_descriptorset.h" #include "vulkan/vk_renderdevice.h" -#include "vulkan/accelstructs/vk_levelmesh.h" +#include "vulkan/vk_levelmesh.h" #include "vulkan/shaders/vk_shader.h" #include "vulkan/samplers/vk_samplers.h" #include "vulkan/textures/vk_renderbuffers.h" diff --git a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp index 02f9352e2..df15faba3 100644 --- a/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp +++ b/src/common/rendering/vulkan/pipelines/vk_renderpass.cpp @@ -24,7 +24,7 @@ #include "vk_pprenderpass.h" #include "vulkan/vk_renderstate.h" #include "vulkan/vk_renderdevice.h" -#include "vulkan/accelstructs/vk_levelmesh.h" +#include "vulkan/vk_levelmesh.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/accelstructs/vk_levelmesh.cpp b/src/common/rendering/vulkan/vk_levelmesh.cpp similarity index 100% rename from src/common/rendering/vulkan/accelstructs/vk_levelmesh.cpp rename to src/common/rendering/vulkan/vk_levelmesh.cpp diff --git a/src/common/rendering/vulkan/accelstructs/vk_levelmesh.h b/src/common/rendering/vulkan/vk_levelmesh.h similarity index 100% rename from src/common/rendering/vulkan/accelstructs/vk_levelmesh.h rename to src/common/rendering/vulkan/vk_levelmesh.h diff --git a/src/common/rendering/vulkan/accelstructs/vk_lightmapper.cpp b/src/common/rendering/vulkan/vk_lightmapper.cpp similarity index 100% rename from src/common/rendering/vulkan/accelstructs/vk_lightmapper.cpp rename to src/common/rendering/vulkan/vk_lightmapper.cpp diff --git a/src/common/rendering/vulkan/accelstructs/vk_lightmapper.h b/src/common/rendering/vulkan/vk_lightmapper.h similarity index 100% rename from src/common/rendering/vulkan/accelstructs/vk_lightmapper.h rename to src/common/rendering/vulkan/vk_lightmapper.h diff --git a/src/common/rendering/vulkan/vk_renderdevice.cpp b/src/common/rendering/vulkan/vk_renderdevice.cpp index eed712e7d..5cac3e741 100644 --- a/src/common/rendering/vulkan/vk_renderdevice.cpp +++ b/src/common/rendering/vulkan/vk_renderdevice.cpp @@ -43,8 +43,8 @@ #include "vk_renderdevice.h" #include "vulkan/vk_renderstate.h" #include "vulkan/vk_postprocess.h" -#include "vulkan/accelstructs/vk_levelmesh.h" -#include "vulkan/accelstructs/vk_lightmapper.h" +#include "vulkan/vk_levelmesh.h" +#include "vulkan/vk_lightmapper.h" #include "vulkan/pipelines/vk_renderpass.h" #include "vulkan/descriptorsets/vk_descriptorset.h" #include "vulkan/shaders/vk_shader.h" diff --git a/src/common/rendering/vulkan/vk_renderstate.cpp b/src/common/rendering/vulkan/vk_renderstate.cpp index 51befe73e..1e4557ea7 100644 --- a/src/common/rendering/vulkan/vk_renderstate.cpp +++ b/src/common/rendering/vulkan/vk_renderstate.cpp @@ -22,13 +22,13 @@ #include "vk_renderstate.h" #include "vulkan/vk_renderdevice.h" +#include "vulkan/vk_levelmesh.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 "vulkan/accelstructs/vk_levelmesh.h" #include #include "hw_skydome.h"