More folder adjustments

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)

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 <zvulkan/vulkanbuilders.h>
 

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

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"

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 <zvulkan/vulkanswapchain.h>
 #include <zvulkan/vulkanbuilders.h>
 #include <zvulkan/vulkansurface.h>

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"