zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-13 06:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Magnus Norddahl 2023-04-16 16:39:15 +02:00 committed by Christoph Oelckers
parent 6781b3215c
commit dd9feeea45
37 changed files with 119 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/CMakeLists.txt
View file

@ -597,8 +597,12 @@ file( GLOB HEADER_FILES
common/rendering/*.h common/rendering/*.h
common/rendering/hwrenderer/data/*.h common/rendering/hwrenderer/data/*.h
common/rendering/vulkan/*.h common/rendering/vulkan/*.h
common/rendering/vulkan/system/*.h common/rendering/vulkan/buffers/*.h
common/rendering/vulkan/renderer/*.h common/rendering/vulkan/commands/*.h
common/rendering/vulkan/descriptorsets/*.h
common/rendering/vulkan/framebuffers/*.h
common/rendering/vulkan/pipelines/*.h
common/rendering/vulkan/samplers/*.h
common/rendering/vulkan/shaders/*.h common/rendering/vulkan/shaders/*.h
common/rendering/vulkan/textures/*.h common/rendering/vulkan/textures/*.h
common/scripting/core/*h common/scripting/core/*h
@ -734,26 +738,26 @@ set( FASTMATH_SOURCES
#Vulkan stuff must go into a separate list because it needs to be disabled for some platforms #Vulkan stuff must go into a separate list because it needs to be disabled for some platforms
set (VULKAN_SOURCES set (VULKAN_SOURCES
common/rendering/vulkan/system/vk_renderdevice.cpp common/rendering/vulkan/vk_renderdevice.cpp
common/rendering/vulkan/system/vk_commandbuffer.cpp common/rendering/vulkan/vk_renderstate.cpp
common/rendering/vulkan/system/vk_hwbuffer.cpp common/rendering/vulkan/vk_streambuffer.cpp
common/rendering/vulkan/system/vk_buffer.cpp common/rendering/vulkan/vk_postprocess.cpp
common/rendering/vulkan/renderer/vk_renderstate.cpp common/rendering/vulkan/vk_pprenderstate.cpp
common/rendering/vulkan/renderer/vk_renderpass.cpp common/rendering/vulkan/vk_raytrace.cpp
common/rendering/vulkan/renderer/vk_streambuffer.cpp common/rendering/vulkan/commands/vk_commandbuffer.cpp
common/rendering/vulkan/renderer/vk_postprocess.cpp common/rendering/vulkan/buffers/vk_hwbuffer.cpp
common/rendering/vulkan/renderer/vk_pprenderstate.cpp common/rendering/vulkan/buffers/vk_buffer.cpp
common/rendering/vulkan/renderer/vk_descriptorset.cpp common/rendering/vulkan/pipelines/vk_renderpass.cpp
common/rendering/vulkan/renderer/vk_raytrace.cpp common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
common/rendering/vulkan/shaders/vk_shader.cpp common/rendering/vulkan/shaders/vk_shader.cpp
common/rendering/vulkan/shaders/vk_ppshader.cpp common/rendering/vulkan/shaders/vk_ppshader.cpp
common/rendering/vulkan/textures/vk_samplers.cpp common/rendering/vulkan/samplers/vk_samplers.cpp
common/rendering/vulkan/textures/vk_hwtexture.cpp common/rendering/vulkan/textures/vk_hwtexture.cpp
common/rendering/vulkan/textures/vk_pptexture.cpp common/rendering/vulkan/textures/vk_pptexture.cpp
common/rendering/vulkan/textures/vk_imagetransition.cpp common/rendering/vulkan/textures/vk_imagetransition.cpp
common/rendering/vulkan/textures/vk_renderbuffers.cpp common/rendering/vulkan/textures/vk_renderbuffers.cpp
common/rendering/vulkan/textures/vk_texture.cpp common/rendering/vulkan/textures/vk_texture.cpp
common/rendering/vulkan/textures/vk_framebuffer.cpp common/rendering/vulkan/framebuffers/vk_framebuffer.cpp
) )
if (HAVE_VULKAN) if (HAVE_VULKAN)
@ -1445,8 +1449,13 @@ source_group("Common\\Rendering" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR
source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+") source_group("Common\\Rendering\\Hardware Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/.+")
source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+") source_group("Common\\Rendering\\Hardware Renderer\\Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/data/.+")
source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+") source_group("Common\\Rendering\\Hardware Renderer\\Postprocessing" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/hwrenderer/postprocessing/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/system/.+") source_group("Common\\Rendering\\Vulkan Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Renderer" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/renderer/.+") source_group("Common\\Rendering\\Vulkan Renderer\\Buffers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/buffers/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Commands" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/commands/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Descriptorsets" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/descriptorsets/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Framebuffers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/framebuffers/.+")
source_group("Common\\Rendering\\Vulkan Renderer\\Pipelines" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/pipelines/.+")
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\\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\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/rendering/vulkan/textures/.+")
source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+") source_group("Common\\Models" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/models/.+")

2
src/common/platform/posix/cocoa/i_video.mm
View file

@ -51,7 +51,7 @@
#include "printf.h" #include "printf.h"
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#endif #endif
bool I_CreateVulkanSurface(VkInstance instance, VkSurfaceKHR *surface); bool I_CreateVulkanSurface(VkInstance instance, VkSurfaceKHR *surface);

2
src/common/platform/posix/sdl/sdlglvideo.cpp
View file

@ -47,7 +47,7 @@
#include "hardware.h" #include "hardware.h"
#ifdef HAVE_VULKAN #ifdef HAVE_VULKAN
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include <zvulkan/vulkaninstance.h> #include <zvulkan/vulkaninstance.h>
#include <zvulkan/vulkansurface.h> #include <zvulkan/vulkansurface.h>
#include <zvulkan/vulkandevice.h> #include <zvulkan/vulkandevice.h>

2
src/common/platform/win32/win32vulkanvideo.h
View file

@ -2,7 +2,7 @@
#include "win32basevideo.h" #include "win32basevideo.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include <zvulkan/vulkansurface.h> #include <zvulkan/vulkansurface.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>

2
src/common/rendering/vulkan/system/vk_buffer.cpp → src/common/rendering/vulkan/buffers/vk_buffer.cpp
View file

@ -22,7 +22,7 @@
#include "vk_buffer.h" #include "vk_buffer.h"
#include "vk_hwbuffer.h" #include "vk_hwbuffer.h"
#include "vulkan/renderer/vk_streambuffer.h" #include "vulkan/vk_streambuffer.h"
#include "hwrenderer/data/shaderuniforms.h" #include "hwrenderer/data/shaderuniforms.h"
VkBufferManager::VkBufferManager(VulkanRenderDevice* fb) : fb(fb) VkBufferManager::VkBufferManager(VulkanRenderDevice* fb) : fb(fb)

0
src/common/rendering/vulkan/system/vk_buffer.h → src/common/rendering/vulkan/buffers/vk_buffer.h
View file

10
src/common/rendering/vulkan/system/vk_hwbuffer.cpp → src/common/rendering/vulkan/buffers/vk_hwbuffer.cpp
View file

@ -21,12 +21,12 @@
*/ */
#include "vk_hwbuffer.h" #include "vk_hwbuffer.h"
#include "zvulkan/vulkanbuilders.h"
#include "vk_renderdevice.h"
#include "vk_commandbuffer.h"
#include "vk_buffer.h" #include "vk_buffer.h"
#include "vulkan/renderer/vk_renderstate.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/renderer/vk_descriptorset.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" #include "engineerrors.h"
VkHardwareBuffer::VkHardwareBuffer(VulkanRenderDevice* fb) : fb(fb) VkHardwareBuffer::VkHardwareBuffer(VulkanRenderDevice* fb) : fb(fb)

0
src/common/rendering/vulkan/system/vk_hwbuffer.h → src/common/rendering/vulkan/buffers/vk_hwbuffer.h
View file

12
src/common/rendering/vulkan/system/vk_commandbuffer.cpp → src/common/rendering/vulkan/commands/vk_commandbuffer.cpp
View file

@ -21,12 +21,12 @@
*/ */
#include "vk_commandbuffer.h" #include "vk_commandbuffer.h"
#include "vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "zvulkan/vulkanswapchain.h" #include "vulkan/vk_renderstate.h"
#include "zvulkan/vulkanbuilders.h" #include "vulkan/vk_postprocess.h"
#include "vulkan/textures/vk_framebuffer.h" #include "vulkan/framebuffers/vk_framebuffer.h"
#include "vulkan/renderer/vk_renderstate.h" #include <zvulkan/vulkanswapchain.h>
#include "vulkan/renderer/vk_postprocess.h" #include <zvulkan/vulkanbuilders.h>
#include "hw_clock.h" #include "hw_clock.h"
#include "v_video.h" #include "v_video.h"

0
src/common/rendering/vulkan/system/vk_commandbuffer.h → src/common/rendering/vulkan/commands/vk_commandbuffer.h
View file

14
src/common/rendering/vulkan/renderer/vk_descriptorset.cpp → src/common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
View file

@ -21,18 +21,18 @@
*/ */
#include "vk_descriptorset.h" #include "vk_descriptorset.h"
#include "vk_streambuffer.h" #include "vulkan/vk_streambuffer.h"
#include "vk_raytrace.h" #include "vulkan/vk_raytrace.h"
#include "vulkan/vk_renderdevice.h"
#include "vulkan/shaders/vk_shader.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_renderbuffers.h"
#include "vulkan/textures/vk_hwtexture.h" #include "vulkan/textures/vk_hwtexture.h"
#include "vulkan/textures/vk_texture.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 <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 "flatvertices.h"
#include "hw_viewpointuniforms.h" #include "hw_viewpointuniforms.h"
#include "v_2ddrawer.h" #include "v_2ddrawer.h"

0
src/common/rendering/vulkan/renderer/vk_descriptorset.h → src/common/rendering/vulkan/descriptorsets/vk_descriptorset.h
View file

4
src/common/rendering/vulkan/textures/vk_framebuffer.cpp → src/common/rendering/vulkan/framebuffers/vk_framebuffer.cpp
View file

@ -24,8 +24,8 @@
#include <zvulkan/vulkandevice.h> #include <zvulkan/vulkandevice.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include <zvulkan/vulkanswapchain.h> #include <zvulkan/vulkanswapchain.h>
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/renderer/vk_postprocess.h" #include "vulkan/vk_postprocess.h"
#include "vk_framebuffer.h" #include "vk_framebuffer.h"
CVAR(Bool, vk_hdr, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG); CVAR(Bool, vk_hdr, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG);

0
src/common/rendering/vulkan/textures/vk_framebuffer.h → src/common/rendering/vulkan/framebuffers/vk_framebuffer.h
View file

12
src/common/rendering/vulkan/renderer/vk_renderpass.cpp → src/common/rendering/vulkan/pipelines/vk_renderpass.cpp
View file

@ -21,16 +21,16 @@
*/ */
#include "vk_renderpass.h" #include "vk_renderpass.h"
#include "vk_renderstate.h" #include "vulkan/vk_renderstate.h"
#include "vk_descriptorset.h" #include "vulkan/vk_raytrace.h"
#include "vk_raytrace.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/descriptorsets/vk_descriptorset.h"
#include "vulkan/textures/vk_renderbuffers.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_shader.h"
#include "vulkan/shaders/vk_ppshader.h" #include "vulkan/shaders/vk_ppshader.h"
#include "vulkan/buffers/vk_hwbuffer.h"
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include "vulkan/system/vk_renderdevice.h"
#include "vulkan/system/vk_hwbuffer.h"
#include "flatvertices.h" #include "flatvertices.h"
#include "hw_viewpointuniforms.h" #include "hw_viewpointuniforms.h"
#include "v_2ddrawer.h" #include "v_2ddrawer.h"

0
src/common/rendering/vulkan/renderer/vk_renderpass.h → src/common/rendering/vulkan/pipelines/vk_renderpass.h
View file

4
src/common/rendering/vulkan/textures/vk_samplers.cpp → src/common/rendering/vulkan/samplers/vk_samplers.cpp
View file

@ -26,8 +26,8 @@
#include "c_cvars.h" #include "c_cvars.h"
#include "v_video.h" #include "v_video.h"
#include "hw_cvars.h" #include "hw_cvars.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vk_samplers.h" #include "vk_samplers.h"
#include "hw_material.h" #include "hw_material.h"
#include "i_interface.h" #include "i_interface.h"

0
src/common/rendering/vulkan/textures/vk_samplers.h → src/common/rendering/vulkan/samplers/vk_samplers.h
View file

6
src/common/rendering/vulkan/shaders/vk_ppshader.cpp
View file

@ -22,9 +22,9 @@
#include "vk_ppshader.h" #include "vk_ppshader.h"
#include "vk_shader.h" #include "vk_shader.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "zvulkan/vulkanbuilders.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/system/vk_commandbuffer.h" #include <zvulkan/vulkanbuilders.h>
#include "filesystem.h" #include "filesystem.h"
#include "cmdlib.h" #include "cmdlib.h"

4
src/common/rendering/vulkan/shaders/vk_shader.cpp
View file

@ -22,8 +22,8 @@
#include "vk_shader.h" #include "vk_shader.h"
#include "vk_ppshader.h" #include "vk_ppshader.h"
#include "zvulkan/vulkanbuilders.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_renderdevice.h" #include <zvulkan/vulkanbuilders.h>
#include "hw_shaderpatcher.h" #include "hw_shaderpatcher.h"
#include "filesystem.h" #include "filesystem.h"
#include "engineerrors.h" #include "engineerrors.h"

10
src/common/rendering/vulkan/textures/vk_hwtexture.cpp
View file

@ -27,13 +27,13 @@
#include "hw_renderstate.h" #include "hw_renderstate.h"
#include <zvulkan/vulkanobjects.h> #include <zvulkan/vulkanobjects.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/vk_postprocess.h"
#include "vulkan/textures/vk_samplers.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/samplers/vk_samplers.h"
#include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_renderbuffers.h"
#include "vulkan/textures/vk_texture.h" #include "vulkan/textures/vk_texture.h"
#include "vulkan/renderer/vk_descriptorset.h" #include "vulkan/descriptorsets/vk_descriptorset.h"
#include "vulkan/renderer/vk_postprocess.h"
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
#include "vk_hwtexture.h" #include "vk_hwtexture.h"

6
src/common/rendering/vulkan/textures/vk_imagetransition.h
View file

@ -3,9 +3,9 @@
#include "zvulkan/vulkanobjects.h" #include "zvulkan/vulkanobjects.h"
#include "zvulkan/vulkanbuilders.h" #include "zvulkan/vulkanbuilders.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/renderer/vk_renderpass.h" #include "vulkan/pipelines/vk_renderpass.h"
class VkTextureImage class VkTextureImage
{ {

4
src/common/rendering/vulkan/textures/vk_pptexture.cpp
View file

@ -22,8 +22,8 @@
#include "vk_pptexture.h" #include "vk_pptexture.h"
#include "vk_texture.h" #include "vk_texture.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/commands/vk_commandbuffer.h"
VkPPTexture::VkPPTexture(VulkanRenderDevice* fb, PPTexture *texture) : fb(fb) VkPPTexture::VkPPTexture(VulkanRenderDevice* fb, PPTexture *texture) : fb(fb)
{ {

8
src/common/rendering/vulkan/textures/vk_renderbuffers.cpp
View file

@ -21,14 +21,14 @@
*/ */
#include "vk_renderbuffers.h" #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_texture.h"
#include "vulkan/textures/vk_framebuffer.h" #include "vulkan/framebuffers/vk_framebuffer.h"
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
#include "vulkan/commands/vk_commandbuffer.h"
#include <zvulkan/vulkanswapchain.h> #include <zvulkan/vulkanswapchain.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include "vulkan/system/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h"
#include "hw_cvars.h" #include "hw_cvars.h"
VkRenderBuffers::VkRenderBuffers(VulkanRenderDevice* fb) : fb(fb) VkRenderBuffers::VkRenderBuffers(VulkanRenderDevice* fb) : fb(fb)

2
src/common/rendering/vulkan/textures/vk_texture.cpp
View file

@ -24,7 +24,7 @@
#include "vk_hwtexture.h" #include "vk_hwtexture.h"
#include "vk_pptexture.h" #include "vk_pptexture.h"
#include "vk_renderbuffers.h" #include "vk_renderbuffers.h"
#include "vulkan/renderer/vk_postprocess.h" #include "vulkan/vk_postprocess.h"
#include "hw_cvars.h" #include "hw_cvars.h"
VkTextureManager::VkTextureManager(VulkanRenderDevice* fb) : fb(fb) VkTextureManager::VkTextureManager(VulkanRenderDevice* fb) : fb(fb)

12
src/common/rendering/vulkan/renderer/vk_postprocess.cpp → src/common/rendering/vulkan/vk_postprocess.cpp
View file

@ -24,17 +24,17 @@
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
#include <zvulkan/vulkanswapchain.h> #include <zvulkan/vulkanswapchain.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_hwbuffer.h" #include "vulkan/buffers/vk_hwbuffer.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/renderer/vk_renderstate.h" #include "vulkan/vk_renderstate.h"
#include "vulkan/renderer/vk_pprenderstate.h" #include "vulkan/vk_pprenderstate.h"
#include "vulkan/shaders/vk_ppshader.h" #include "vulkan/shaders/vk_ppshader.h"
#include "vulkan/textures/vk_pptexture.h" #include "vulkan/textures/vk_pptexture.h"
#include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_renderbuffers.h"
#include "vulkan/textures/vk_imagetransition.h" #include "vulkan/textures/vk_imagetransition.h"
#include "vulkan/textures/vk_texture.h" #include "vulkan/textures/vk_texture.h"
#include "vulkan/textures/vk_framebuffer.h" #include "vulkan/framebuffers/vk_framebuffer.h"
#include "hw_cvars.h" #include "hw_cvars.h"
#include "hwrenderer/postprocessing/hw_postprocess.h" #include "hwrenderer/postprocessing/hw_postprocess.h"
#include "hwrenderer/postprocessing/hw_postprocess_cvars.h" #include "hwrenderer/postprocessing/hw_postprocess_cvars.h"

0
src/common/rendering/vulkan/renderer/vk_postprocess.h → src/common/rendering/vulkan/vk_postprocess.h
View file

16
src/common/rendering/vulkan/renderer/vk_pprenderstate.cpp → src/common/rendering/vulkan/vk_pprenderstate.cpp
View file

@ -22,18 +22,18 @@
#include "vk_pprenderstate.h" #include "vk_pprenderstate.h"
#include "vk_postprocess.h" #include "vk_postprocess.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/vk_renderstate.h"
#include <zvulkan/vulkanswapchain.h> #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/system/vk_buffer.h" #include "vulkan/buffers/vk_buffer.h"
#include "vulkan/shaders/vk_ppshader.h" #include "vulkan/shaders/vk_ppshader.h"
#include "vulkan/textures/vk_pptexture.h" #include "vulkan/textures/vk_pptexture.h"
#include "vulkan/textures/vk_renderbuffers.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_texture.h"
#include "vulkan/textures/vk_framebuffer.h" #include "vulkan/framebuffers/vk_framebuffer.h"
#include "vulkan/renderer/vk_renderstate.h" #include "vulkan/descriptorsets/vk_descriptorset.h"
#include "vulkan/renderer/vk_descriptorset.h" #include <zvulkan/vulkanswapchain.h>
#include "flatvertices.h" #include "flatvertices.h"
VkPPRenderState::VkPPRenderState(VulkanRenderDevice* fb) : fb(fb) VkPPRenderState::VkPPRenderState(VulkanRenderDevice* fb) : fb(fb)

0
src/common/rendering/vulkan/renderer/vk_pprenderstate.h → src/common/rendering/vulkan/vk_pprenderstate.h
View file

4
src/common/rendering/vulkan/renderer/vk_raytrace.cpp → src/common/rendering/vulkan/vk_raytrace.cpp
View file

@ -22,8 +22,8 @@
#include "vk_raytrace.h" #include "vk_raytrace.h"
#include "zvulkan/vulkanbuilders.h" #include "zvulkan/vulkanbuilders.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "hw_levelmesh.h" #include "hw_levelmesh.h"
VkRaytrace::VkRaytrace(VulkanRenderDevice* fb) : fb(fb) VkRaytrace::VkRaytrace(VulkanRenderDevice* fb) : fb(fb)

0
src/common/rendering/vulkan/renderer/vk_raytrace.h → src/common/rendering/vulkan/vk_raytrace.h
View file

22
src/common/rendering/vulkan/system/vk_renderdevice.cpp → src/common/rendering/vulkan/vk_renderdevice.cpp
View file

@ -44,25 +44,25 @@
#include "hw_bonebuffer.h" #include "hw_bonebuffer.h"
#include "vk_renderdevice.h" #include "vk_renderdevice.h"
#include "vk_hwbuffer.h" #include "vulkan/vk_renderstate.h"
#include "vulkan/renderer/vk_renderstate.h" #include "vulkan/vk_streambuffer.h"
#include "vulkan/renderer/vk_renderpass.h" #include "vulkan/vk_postprocess.h"
#include "vulkan/renderer/vk_descriptorset.h" #include "vulkan/vk_raytrace.h"
#include "vulkan/renderer/vk_streambuffer.h" #include "vulkan/pipelines/vk_renderpass.h"
#include "vulkan/renderer/vk_postprocess.h" #include "vulkan/descriptorsets/vk_descriptorset.h"
#include "vulkan/renderer/vk_raytrace.h"
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
#include "vulkan/samplers/vk_samplers.h"
#include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_renderbuffers.h"
#include "vulkan/textures/vk_samplers.h"
#include "vulkan/textures/vk_hwtexture.h" #include "vulkan/textures/vk_hwtexture.h"
#include "vulkan/textures/vk_texture.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/vulkanswapchain.h>
#include <zvulkan/vulkanbuilders.h> #include <zvulkan/vulkanbuilders.h>
#include <zvulkan/vulkansurface.h> #include <zvulkan/vulkansurface.h>
#include <zvulkan/vulkancompatibledevice.h> #include <zvulkan/vulkancompatibledevice.h>
#include "vulkan/system/vk_commandbuffer.h"
#include "vulkan/system/vk_buffer.h"
#include "engineerrors.h" #include "engineerrors.h"
#include "c_dispatch.h" #include "c_dispatch.h"

0
src/common/rendering/vulkan/system/vk_renderdevice.h → src/common/rendering/vulkan/vk_renderdevice.h
View file

12
src/common/rendering/vulkan/renderer/vk_renderstate.cpp → src/common/rendering/vulkan/vk_renderstate.cpp
View file

@ -21,14 +21,14 @@
*/ */
#include "vk_renderstate.h" #include "vk_renderstate.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "zvulkan/vulkanbuilders.h" #include "vulkan/commands/vk_commandbuffer.h"
#include "vulkan/system/vk_commandbuffer.h" #include "vulkan/buffers/vk_buffer.h"
#include "vulkan/system/vk_buffer.h" #include "vulkan/pipelines/vk_renderpass.h"
#include "vulkan/renderer/vk_renderpass.h" #include "vulkan/descriptorsets/vk_descriptorset.h"
#include "vulkan/renderer/vk_descriptorset.h"
#include "vulkan/textures/vk_renderbuffers.h" #include "vulkan/textures/vk_renderbuffers.h"
#include "vulkan/textures/vk_hwtexture.h" #include "vulkan/textures/vk_hwtexture.h"
#include <zvulkan/vulkanbuilders.h>
#include "hw_skydome.h" #include "hw_skydome.h"
#include "hw_viewpointuniforms.h" #include "hw_viewpointuniforms.h"

6
src/common/rendering/vulkan/renderer/vk_renderstate.h → src/common/rendering/vulkan/vk_renderstate.h
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
#include "vulkan/system/vk_hwbuffer.h" #include "vulkan/buffers/vk_hwbuffer.h"
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
#include "vulkan/renderer/vk_renderpass.h" #include "vulkan/pipelines/vk_renderpass.h"
#include "vulkan/renderer/vk_streambuffer.h" #include "vk_streambuffer.h"
#include "name.h" #include "name.h"

8
src/common/rendering/vulkan/renderer/vk_streambuffer.cpp → src/common/rendering/vulkan/vk_streambuffer.cpp
View file

@ -21,10 +21,10 @@
*/ */
#include "vk_renderstate.h" #include "vk_renderstate.h"
#include "vulkan/system/vk_renderdevice.h" #include "vulkan/vk_renderdevice.h"
#include "zvulkan/vulkanbuilders.h" #include "vulkan/vk_streambuffer.h"
#include "vulkan/system/vk_buffer.h" #include "vulkan/buffers/vk_buffer.h"
#include "vulkan/renderer/vk_streambuffer.h" #include <zvulkan/vulkanbuilders.h>
VkStreamBufferWriter::VkStreamBufferWriter(VulkanRenderDevice* fb) VkStreamBufferWriter::VkStreamBufferWriter(VulkanRenderDevice* fb)
{ {

2
src/common/rendering/vulkan/renderer/vk_streambuffer.h → src/common/rendering/vulkan/vk_streambuffer.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "vulkan/system/vk_hwbuffer.h" #include "vulkan/buffers/vk_hwbuffer.h"
#include "vulkan/shaders/vk_shader.h" #include "vulkan/shaders/vk_shader.h"
class VkStreamBuffer; class VkStreamBuffer;