Change the folder structure of the vulkan backend to better reflect what is going on

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)

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 <zvulkan/vulkanbuilders.h>
 #include "engineerrors.h"
 
 VkHardwareBuffer::VkHardwareBuffer(VulkanRenderDevice* fb) : fb(fb)

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 <zvulkan/vulkanswapchain.h>
+#include <zvulkan/vulkanbuilders.h>
 #include "hw_clock.h"
 #include "v_video.h"
 

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

src/common/rendering/vulkan/framebuffers/vk_framebuffer.cpp

@@ -24,8 +24,8 @@
 #include <zvulkan/vulkandevice.h>
 #include <zvulkan/vulkanbuilders.h>
 #include <zvulkan/vulkanswapchain.h>
-#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);

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 <zvulkan/vulkanbuilders.h>
-#include "vulkan/system/vk_renderdevice.h"
-#include "vulkan/system/vk_hwbuffer.h"
 #include "flatvertices.h"
 #include "hw_viewpointuniforms.h"
 #include "v_2ddrawer.h"

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"

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 <zvulkan/vulkanbuilders.h>
 #include "filesystem.h"
 
 VkPPShader::VkPPShader(VulkanRenderDevice* fb, PPShader *shader) : fb(fb)

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

src/common/rendering/vulkan/textures/vk_hwtexture.cpp

@@ -27,13 +27,13 @@
 #include "hw_renderstate.h"
 #include <zvulkan/vulkanobjects.h>
 #include <zvulkan/vulkanbuilders.h>
-#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"
 

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
 {

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)
 {

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 <zvulkan/vulkanswapchain.h>
 #include <zvulkan/vulkanbuilders.h>
-#include "vulkan/system/vk_renderdevice.h"
-#include "vulkan/system/vk_commandbuffer.h"
 #include "hw_cvars.h"
 
 VkRenderBuffers::VkRenderBuffers(VulkanRenderDevice* fb) : fb(fb)

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)

src/common/rendering/vulkan/vk_postprocess.cpp

@@ -24,17 +24,17 @@
 #include "vulkan/shaders/vk_shader.h"
 #include <zvulkan/vulkanswapchain.h>
 #include <zvulkan/vulkanbuilders.h>
-#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"

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 <zvulkan/vulkanswapchain.h>
-#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 <zvulkan/vulkanswapchain.h>
 #include "flatvertices.h"
 
 VkPPRenderState::VkPPRenderState(VulkanRenderDevice* fb) : fb(fb)

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)

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 <zvulkan/vulkanswapchain.h>
 #include <zvulkan/vulkanbuilders.h>
 #include <zvulkan/vulkansurface.h>
 #include <zvulkan/vulkancompatibledevice.h>
-#include "vulkan/system/vk_commandbuffer.h"
-#include "vulkan/system/vk_buffer.h"
 #include "engineerrors.h"
 #include "c_dispatch.h"
 

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

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"
 

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 <zvulkan/vulkanbuilders.h>
 
 VkStreamBufferWriter::VkStreamBufferWriter(VulkanRenderDevice* fb)
 {

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;