qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 02:11:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[vulkan] Clean up a pile of unnecessary includes

Browse source
This commit is contained in:
Bill Currie 2022-05-08 17:57:40 +09:00
parent 09d5c76fe9
commit b33df8b698
22 changed files with 19 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/QF/Vulkan/capture.h
View file

@ -1,6 +1,11 @@
#ifndef __QF_Vulkan_capture_h
#define __QF_Vulkan_capture_h
#ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES
#endif
#include <vulkan/vulkan.h>
#include "QF/darray.h"
#include "QF/qtypes.h"

5
include/QF/Vulkan/command.h
View file

@ -1,6 +1,11 @@
#ifndef __QF_Vulkan_command_h
#define __QF_Vulkan_command_h
#ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES
#endif
#include <vulkan/vulkan.h>
#include "QF/darray.h"
typedef struct qfv_cmdbufferset_s

5
include/QF/Vulkan/descriptor.h
View file

@ -1,6 +1,11 @@
#ifndef __QF_Vulkan_descriptor_h
#define __QF_Vulkan_descriptor_h
#ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES
#endif
#include <vulkan/vulkan.h>
#include "QF/darray.h"
typedef struct qfv_bindingset_s

1
libs/video/renderer/vulkan/barrier.c
View file

@ -28,7 +28,6 @@
# include "config.h"
#endif
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/barrier.h"
const qfv_imagebarrier_t imageBarriers[] = {

1
libs/video/renderer/vulkan/buffer.c
View file

@ -29,7 +29,6 @@
#endif
#include "QF/mathlib.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/instance.h"

1
libs/video/renderer/vulkan/capture.c
View file

@ -28,7 +28,6 @@
# include "config.h"
#endif
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/capture.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/device.h"

1
libs/video/renderer/vulkan/command.c
View file

@ -28,7 +28,6 @@
# include "config.h"
#endif
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/device.h"

1
libs/video/renderer/vulkan/descriptor.c
View file

@ -30,7 +30,6 @@
#include "QF/hash.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"

1
libs/video/renderer/vulkan/device.c
View file

@ -32,7 +32,6 @@
#include "QF/sys.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/instance.h"

1
libs/video/renderer/vulkan/image.c
View file

@ -30,7 +30,6 @@
#include "QF/mathlib.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/barrier.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"

1
libs/video/renderer/vulkan/memory.c
View file

@ -28,7 +28,6 @@
# include "config.h"
#endif
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/memory.h"

1
libs/video/renderer/vulkan/pipeline.c
View file

@ -30,7 +30,6 @@
#include "QF/dstring.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/pipeline.h"

1
libs/video/renderer/vulkan/renderpass.c
View file

@ -30,7 +30,6 @@
#include "QF/cvar.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/renderpass.h"

1
libs/video/renderer/vulkan/scrap.c
View file

@ -34,7 +34,6 @@
#include "QF/render.h"
#include "QF/ui/vrect.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/barrier.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/command.h"

1
libs/video/renderer/vulkan/staging.c
View file

@ -30,7 +30,6 @@
#include "QF/dstring.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/debug.h"

2
libs/video/renderer/vulkan/swapchain.c
View file

@ -9,13 +9,11 @@
#include "QF/cvar.h"
#include "QF/mathlib.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/swapchain.h"
#include "r_internal.h"
#include "vid_vulkan.h"
qfv_swapchain_t *

1
libs/video/renderer/vulkan/vkparse.c
View file

@ -36,7 +36,6 @@
#include "QF/mathlib.h"
#include "QF/va.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/instance.h"

25
libs/video/renderer/vulkan/vulkan_main.c
View file

@ -150,28 +150,3 @@ Vulkan_NewScene (scene_t *scene, vulkan_ctx_t *ctx)
Vulkan_BuildDisplayLists (scene->models, scene->num_models, ctx);
Vulkan_LoadLights (scene, ctx);
}
/*void
glsl_R_LineGraph (int x, int y, int *h_vals, int count)
{
}*/
/*void
glsl_R_TimeRefresh_f (void)
{
double start, stop, time;
int i;
glsl_ctx->end_rendering ();
start = Sys_DoubleTime ();
for (i = 0; i < 128; i++) {
r_refdef.viewangles[1] = i * (360.0 / 128.0);
Vulkan_RenderView (ctx);
glsl_ctx->end_rendering ();
}
stop = Sys_DoubleTime ();
time = stop - start;
Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
}*/

4
libs/video/renderer/vulkan/vulkan_matrices.c
View file

@ -49,16 +49,12 @@
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/projection.h"
#include "QF/Vulkan/renderpass.h"
#include "QF/Vulkan/staging.h"
#include "QF/ui/view.h"
#include "r_internal.h"
#include "vid_vulkan.h"
#include "util.h"
static void
setup_view (vulkan_ctx_t *ctx)
{

4
libs/video/renderer/vulkan/vulkan_particles.c
View file

@ -42,9 +42,6 @@
#include "QF/render.h"
#include "QF/va.h"
#include "QF/plugin/vid_render.h"
#include "QF/Vulkan/qf_vid.h" //FIXME header issues
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/device.h"
@ -52,7 +49,6 @@
#include "QF/Vulkan/staging.h"
#include "QF/Vulkan/qf_particles.h"
#include "r_internal.h"
#include "vid_vulkan.h"
//FIXME make dynamic

14
libs/video/renderer/vulkan/vulkan_texture.c
View file

@ -38,30 +38,16 @@
# include <strings.h>
#endif
#include "QF/alloc.h"
#include "QF/cvar.h"
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/image.h"
#include "QF/mathlib.h"
#include "QF/quakefs.h"
#include "QF/render.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/qf_texture.h"
#include "QF/Vulkan/barrier.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/scrap.h"
#include "QF/Vulkan/staging.h"
#include "r_scrap.h"
#include "vid_vulkan.h"
void

27
libs/video/renderer/vulkan/vulkan_vid_common.c
View file

@ -31,40 +31,22 @@
#ifdef HAVE_MATH_H
# include <math.h>
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <string.h>
#include "QF/cexpr.h"
#include "QF/cmem.h"
#include "QF/cvar.h"
#include "QF/dstring.h"
#include "QF/hash.h"
#include "QF/mathlib.h"
#include "QF/plist.h"
#include "QF/qargs.h"
#include "QF/quakefs.h"
#include "QF/sys.h"
#include "QF/va.h"
#include "QF/simd/vec4f.h"
#include "QF/scene/entity.h"
#include "QF/Vulkan/qf_matrices.h"
#include "QF/Vulkan/qf_vid.h"
#include "QF/Vulkan/barrier.h"
#include "QF/Vulkan/buffer.h"
#include "QF/Vulkan/capture.h"
#include "QF/Vulkan/debug.h"
#include "QF/Vulkan/descriptor.h"
#include "QF/Vulkan/device.h"
#include "QF/Vulkan/command.h"
#include "QF/Vulkan/instance.h"
#include "QF/Vulkan/image.h"
#include "QF/Vulkan/pipeline.h"
#include "QF/Vulkan/renderpass.h"
#include "QF/Vulkan/shader.h"
#include "QF/Vulkan/staging.h"
#include "QF/Vulkan/swapchain.h"
@ -74,13 +56,12 @@
#include "QF/Vulkan/qf_draw.h"
#include "QF/Vulkan/qf_lighting.h"
#include "QF/Vulkan/qf_main.h"
#include "QF/Vulkan/qf_matrices.h"
#include "QF/Vulkan/qf_vid.h"
#include "compat.h"
#include "d_iface.h"
#include "r_internal.h"
#include "vid_vulkan.h"
#include "util.h"
#include "vkparse.h"
#include "libs/video/renderer/vulkan/vkparse.hinc"