qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 01:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[renderer] Clean up some unwanted dependencies

Browse source 
Nothing outside of the renderer should be including d_iface.h (locs.c
does still for particle defines), and plugin/vid_render.h is more
independent.
This commit is contained in:
Bill Currie 2022-05-26 14:41:08 +09:00
parent dcfe0e33a3
commit c86cb0ac54
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/plugin/vid_render.h
View file

@ -43,6 +43,7 @@ struct mod_sprite_ctx_s;
struct entqueue_s;
struct framebuffer_s;
struct vrect_s;
struct texture_s;
/*
All video plugins must export these functions
@ -52,7 +53,7 @@ typedef struct vid_model_funcs_s {
size_t texture_render_size;// size of renderer specific texture data
void (*Mod_LoadLighting) (model_t *mod, bsp_t *bsp);
void (*Mod_SubdivideSurface) (model_t *mod, msurface_t *fa);
void (*Mod_ProcessTexture) (model_t *mod, texture_t *tx);
void (*Mod_ProcessTexture) (model_t *mod, struct texture_s *tx);
void (*Mod_LoadIQM) (model_t *mod, void *buffer);
void (*Mod_LoadAliasModel) (model_t *mod, void *buffer,
cache_allocator_t allocator);

2
include/d_iface.h
View file

@ -193,7 +193,7 @@ typedef struct
msurface_t *surf; // description for surface to generate
fixed8_t lightadj[MAXLIGHTMAPS];
// adjust for lightmap levels for dynamic lighting
texture_t *texture; // corrected for animating textures
struct texture_s *texture; // corrected for animating textures
int surfmip; // mipmapped ratio of surface texels / world pixels
int surfwidth; // in mipmapped texels
int surfheight; // in mipmapped texels

7
include/mod_internal.h
View file

@ -77,10 +77,11 @@ void sw_Mod_IQMFinish (model_t *mod);
void gl_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
void gl_Mod_SubdivideSurface (model_t *mod, msurface_t *fa);
void gl_Mod_ProcessTexture (model_t *mod, texture_t *tx);
struct texture_s;
void gl_Mod_ProcessTexture (model_t *mod, struct texture_s *tx);
void glsl_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
void glsl_Mod_ProcessTexture (model_t *mod, texture_t *tx);
void glsl_Mod_ProcessTexture (model_t *mod, struct texture_s *tx);
void sw_Mod_LoadLighting (model_t *mod, bsp_t *bsp);
@ -88,7 +89,7 @@ void Vulkan_Mod_LoadLighting (model_t *mod, bsp_t *bsp,
struct vulkan_ctx_s *ctx);
void Vulkan_Mod_SubdivideSurface (model_t *mod, msurface_t *fa,
struct vulkan_ctx_s *ctx);
void Vulkan_Mod_ProcessTexture (model_t *mod, texture_t *tx,
void Vulkan_Mod_ProcessTexture (model_t *mod, struct texture_s *tx,
struct vulkan_ctx_s *ctx);
void Mod_LoadSpriteFrame (mspriteframe_t *frame, const dspriteframe_t *dframe);

4
include/r_local.h
View file

@ -155,7 +155,7 @@ void R_RenderBmodelFace (struct entity_s *ent, bedge_t *pedges, msurface_t *psur
void R_TransformFrustum (void);
void R_SetSkyFrame (void);
void R_DrawSurfaceBlock (void);
texture_t *R_TextureAnimation (const struct entity_s *entity, msurface_t *surf) __attribute__((pure));
struct texture_s *R_TextureAnimation (const struct entity_s *entity, msurface_t *surf) __attribute__((pure));
void R_GenSkyTile (void *pdest);
void R_SurfPatch (void);
@ -184,7 +184,7 @@ void D_DrawSurfaces (void);
void R_InsertNewEdges (edge_t *edgestoadd, edge_t *edgelist);
void R_StepActiveU (edge_t *pedge);
void R_RemoveEdges (edge_t *pedge);
void R_AddTexture (texture_t *tex);
void R_AddTexture (struct texture_s *tex);
struct vulkan_ctx_s;
void R_ClearTextures (void);
void R_InitSurfaceChains (mod_brush_t *brush);

1
qw/source/cl_ents.c
View file

@ -45,7 +45,6 @@
#include "QF/scene/scene.h"
#include "compat.h"
#include "d_iface.h"
#include "client/effects.h"
#include "client/locs.h"