More folder adjustments

This commit is contained in:
Magnus Norddahl 2023-04-16 16:51:52 +02:00 committed by Christoph Oelckers
parent dd9feeea45
commit 3551e1e5e9
10 changed files with 15 additions and 13 deletions

View file

@ -605,6 +605,7 @@ 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
@ -740,24 +741,24 @@ set( FASTMATH_SOURCES
set (VULKAN_SOURCES
common/rendering/vulkan/vk_renderdevice.cpp
common/rendering/vulkan/vk_renderstate.cpp
common/rendering/vulkan/vk_streambuffer.cpp
common/rendering/vulkan/vk_postprocess.cpp
common/rendering/vulkan/vk_pprenderstate.cpp
common/rendering/vulkan/vk_raytrace.cpp
common/rendering/vulkan/commands/vk_commandbuffer.cpp
common/rendering/vulkan/buffers/vk_streambuffer.cpp
common/rendering/vulkan/buffers/vk_hwbuffer.cpp
common/rendering/vulkan/buffers/vk_buffer.cpp
common/rendering/vulkan/pipelines/vk_renderpass.cpp
common/rendering/vulkan/samplers/vk_samplers.cpp
common/rendering/vulkan/descriptorsets/vk_descriptorset.cpp
common/rendering/vulkan/pipelines/vk_renderpass.cpp
common/rendering/vulkan/shaders/vk_shader.cpp
common/rendering/vulkan/shaders/vk_ppshader.cpp
common/rendering/vulkan/samplers/vk_samplers.cpp
common/rendering/vulkan/textures/vk_hwtexture.cpp
common/rendering/vulkan/textures/vk_pptexture.cpp
common/rendering/vulkan/textures/vk_imagetransition.cpp
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_raytrace.cpp
)
if (HAVE_VULKAN)
@ -1458,6 +1459,7 @@ 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/.+")

View file

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

View file

@ -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>

View file

@ -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"

View file

@ -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"

View file

@ -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>

View file

@ -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"