Moving files

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/.+")

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"

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"

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"

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 <zvulkan/vulkanbuilders.h>
 
 #include "hw_skydome.h"