From 01918110d7129382c4e149481b02216e08a53f4d Mon Sep 17 00:00:00 2001 From: Denis Pauk Date: Wed, 7 Oct 2020 21:44:01 +0300 Subject: [PATCH] fix symbol collision --- src/client/refresh/vk/header/local.h | 34 +++++++-------- src/client/refresh/vk/vk_draw.c | 46 ++++++++++----------- src/client/refresh/vk/vk_image.c | 4 +- src/client/refresh/vk/vk_model.c | 12 +++--- src/client/refresh/vk/vk_rmain.c | 62 ++++++++++++++-------------- src/client/refresh/vk/vk_rmisc.c | 4 +- src/client/refresh/vk/vk_warp.c | 4 +- 7 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/client/refresh/vk/header/local.h b/src/client/refresh/vk/header/local.h index 1431e9a8..2d9cc602 100644 --- a/src/client/refresh/vk/header/local.h +++ b/src/client/refresh/vk/header/local.h @@ -186,7 +186,7 @@ extern int registration_sequence; extern qvksampler_t vk_current_sampler; extern qvksampler_t vk_current_lmap_sampler; -void R_Shutdown( void ); +void RE_Shutdown( void ); void Vk_ScreenShot_f (void); void R_DrawAliasModel (entity_t *e, model_t *currentmodel); @@ -196,7 +196,7 @@ void R_DrawBeam( entity_t *e ); void R_DrawWorld (void); void R_RenderDlights (void); void R_DrawAlphaSurfaces (void); -void R_InitParticleTexture (void); +void RE_InitParticleTexture (void); void Draw_InitLocal (void); void Vk_SubdivideSurface (msurface_t *fa); qboolean R_CullBox (vec3_t mins, vec3_t maxs); @@ -209,20 +209,20 @@ void R_ClearSkyBox (void); void R_DrawSkyBox (void); void R_MarkLights (dlight_t *light, int bit, mnode_t *node); -struct image_s *Draw_FindPic (char *name); +struct image_s *RE_Draw_FindPic (char *name); -void Draw_GetPicSize (int *w, int *h, char *name); -void Draw_PicScaled (int x, int y, char *name, float scale); -void Draw_StretchPic (int x, int y, int w, int h, char *name); -void Draw_CharScaled (int x, int y, int c, float scale); -void Draw_TileClear (int x, int y, int w, int h, char *name); -void Draw_Fill (int x, int y, int w, int h, int c); -void Draw_FadeScreen (void); -void Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte *data); +void RE_Draw_GetPicSize (int *w, int *h, char *name); +void RE_Draw_PicScaled (int x, int y, char *name, float scale); +void RE_Draw_StretchPic (int x, int y, int w, int h, char *name); +void RE_Draw_CharScaled (int x, int y, int c, float scale); +void RE_Draw_TileClear (int x, int y, int w, int h, char *name); +void RE_Draw_Fill (int x, int y, int w, int h, int c); +void RE_Draw_FadeScreen (void); +void RE_Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte *data); qboolean RE_EndWorldRenderpass( void ); -struct image_s *R_RegisterSkin (char *name); +struct image_s *RE_RegisterSkin (char *name); void LoadPCX (char *filename, byte **pic, byte **palette, int *width, int *height); image_t *Vk_LoadPic(char *name, byte *pic, int width, int realwidth, @@ -237,11 +237,11 @@ void Vk_InitImages (void); void Vk_ShutdownImages (void); void Vk_FreeUnusedImages (void); -void R_BeginRegistration (char *model); -struct model_s *R_RegisterModel (char *name); -struct image_s *R_RegisterSkin (char *name); -void R_SetSky (char *name, float rotate, vec3_t axis); -void R_EndRegistration (void); +void RE_BeginRegistration (char *model); +struct model_s *RE_RegisterModel (char *name); +struct image_s *RE_RegisterSkin (char *name); +void RE_SetSky (char *name, float rotate, vec3_t axis); +void RE_EndRegistration (void); void Mat_Identity(float *matrix); void Mat_Mul(float *m1, float *m2, float *res); diff --git a/src/client/refresh/vk/vk_draw.c b/src/client/refresh/vk/vk_draw.c index 6fa3b00a..20732015 100644 --- a/src/client/refresh/vk/vk_draw.c +++ b/src/client/refresh/vk/vk_draw.c @@ -44,14 +44,14 @@ void Draw_InitLocal (void) /* ================ -Draw_CharScaled +RE_Draw_CharScaled Draws one 8*8 graphics character with 0 being transparent. It can be clipped to the top of the screen to allow the console to be smoothly scrolled off. ================ */ -void Draw_CharScaled (int x, int y, int num, float scale) +void RE_Draw_CharScaled (int x, int y, int num, float scale) { int row, col; float frow, fcol, size; @@ -79,10 +79,10 @@ void Draw_CharScaled (int x, int y, int num, float scale) /* ============= -Draw_FindPic +RE_Draw_FindPic ============= */ -image_t *Draw_FindPic (char *name) +image_t *RE_Draw_FindPic (char *name) { image_t *vk; @@ -101,14 +101,14 @@ image_t *Draw_FindPic (char *name) /* ============= -Draw_GetPicSize +RE_Draw_GetPicSize ============= */ -void Draw_GetPicSize (int *w, int *h, char *name) +void RE_Draw_GetPicSize (int *w, int *h, char *name) { image_t *vk; - vk = Draw_FindPic(name); + vk = RE_Draw_FindPic(name); if (!vk) { *w = *h = -1; @@ -121,14 +121,14 @@ void Draw_GetPicSize (int *w, int *h, char *name) /* ============= -Draw_StretchPic +RE_Draw_StretchPic ============= */ -void Draw_StretchPic (int x, int y, int w, int h, char *name) +void RE_Draw_StretchPic (int x, int y, int w, int h, char *name) { image_t *vk; - vk = Draw_FindPic(name); + vk = RE_Draw_FindPic(name); if (!vk) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name); @@ -145,36 +145,36 @@ void Draw_StretchPic (int x, int y, int w, int h, char *name) /* ============= -Draw_PicScaled +RE_Draw_PicScaled ============= */ -void Draw_PicScaled (int x, int y, char *pic, float factor) +void RE_Draw_PicScaled (int x, int y, char *pic, float factor) { image_t *vk; - vk = Draw_FindPic(pic); + vk = RE_Draw_FindPic(pic); if (!vk) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, pic); return; } - Draw_StretchPic(x, y, vk->width*factor, vk->height*factor, pic); + RE_Draw_StretchPic(x, y, vk->width*factor, vk->height*factor, pic); } /* ============= -Draw_TileClear +RE_Draw_TileClear This repeats a 64*64 tile graphic to fill the screen around a sized down refresh window. ============= */ -void Draw_TileClear (int x, int y, int w, int h, char *name) +void RE_Draw_TileClear (int x, int y, int w, int h, char *name) { image_t *image; - image = Draw_FindPic(name); + image = RE_Draw_FindPic(name); if (!image) { R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name); @@ -191,12 +191,12 @@ void Draw_TileClear (int x, int y, int w, int h, char *name) /* ============= -Draw_Fill +RE_Draw_Fill Fills a box of pixels with a single color ============= */ -void Draw_Fill (int x, int y, int w, int h, int c) +void RE_Draw_Fill (int x, int y, int w, int h, int c) { union { @@ -219,11 +219,11 @@ void Draw_Fill (int x, int y, int w, int h, int c) /* ================ -Draw_FadeScreen +RE_Draw_FadeScreen ================ */ -void Draw_FadeScreen (void) +void RE_Draw_FadeScreen (void) { float imgTransform[] = { 0.f, 0.f, vid.width, vid.height, 0.f, 0.f, 0.f, .8f }; @@ -236,7 +236,7 @@ void Draw_FadeScreen (void) /* ============= -Draw_StretchRaw +RE_Draw_StretchRaw ============= */ extern unsigned r_rawpalette[256]; @@ -244,7 +244,7 @@ extern qvktexture_t vk_rawTexture; static unsigned raw_image32[512 * 512]; -void Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte *data) +void RE_Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, byte *data) { int i, j; diff --git a/src/client/refresh/vk/vk_image.c b/src/client/refresh/vk/vk_image.c index c8ebf71a..4292a11e 100644 --- a/src/client/refresh/vk/vk_image.c +++ b/src/client/refresh/vk/vk_image.c @@ -1551,10 +1551,10 @@ image_t *Vk_FindImage (char *name, imagetype_t type, qvksampler_t *samplerType) /* =============== -R_RegisterSkin +RE_RegisterSkin =============== */ -struct image_s *R_RegisterSkin (char *name) +struct image_s *RE_RegisterSkin (char *name) { return Vk_FindImage (name, it_skin, NULL); } diff --git a/src/client/refresh/vk/vk_model.c b/src/client/refresh/vk/vk_model.c index 2b4bfc65..bd30980a 100644 --- a/src/client/refresh/vk/vk_model.c +++ b/src/client/refresh/vk/vk_model.c @@ -1073,13 +1073,13 @@ static void Mod_LoadSpriteModel (model_t *mod, void *buffer) /* ===================== -R_BeginRegistration +RE_BeginRegistration Specifies the model that will be used as the world ===================== */ void -R_BeginRegistration (char *map) +RE_BeginRegistration (char *map) { char fullname[MAX_QPATH]; cvar_t *flushmap; @@ -1102,11 +1102,11 @@ R_BeginRegistration (char *map) /* ===================== -R_RegisterModel +RE_RegisterModel ===================== */ -struct model_s *R_RegisterModel (char *name) +struct model_s *RE_RegisterModel (char *name) { model_t *mod; dmdl_t *pheader; @@ -1148,11 +1148,11 @@ struct model_s *R_RegisterModel (char *name) /* ===================== -R_EndRegistration +RE_EndRegistration ===================== */ -void R_EndRegistration (void) +void RE_EndRegistration (void) { int i; model_t *mod; diff --git a/src/client/refresh/vk/vk_rmain.c b/src/client/refresh/vk/vk_rmain.c index 9444f84a..968e2cc9 100644 --- a/src/client/refresh/vk/vk_rmain.c +++ b/src/client/refresh/vk/vk_rmain.c @@ -1280,10 +1280,10 @@ qboolean R_SetMode (void) /* =============== -R_Init +RE_Init =============== */ -static qboolean R_Init( void ) +static qboolean RE_Init( void ) { R_Printf(PRINT_ALL, "Refresh: " REF_VERSION "\n"); @@ -1306,7 +1306,7 @@ static qboolean R_Init( void ) Vk_InitImages(); Mod_Init(); - R_InitParticleTexture(); + RE_InitParticleTexture(); Draw_InitLocal(); R_Printf(PRINT_ALL, "Successfully initialized Vulkan!\n"); @@ -1315,13 +1315,13 @@ static qboolean R_Init( void ) } /* -** R_ShutdownContext +** RE_ShutdownContext ** ** This routine does all OS specific shutdown procedures for the Vulkan ** subsystem. ** */ -static void R_ShutdownContext( void ) +static void RE_ShutdownContext( void ) { // Shutdown Vulkan subsystem @@ -1330,10 +1330,10 @@ static void R_ShutdownContext( void ) /* =============== -R_Shutdown +RE_Shutdown =============== */ -void R_Shutdown (void) +void RE_Shutdown (void) { ri.Cmd_RemoveCommand("vk_strings"); ri.Cmd_RemoveCommand("vk_mem"); @@ -1348,7 +1348,7 @@ void R_Shutdown (void) Mod_FreeAll(); Vk_ShutdownImages(); - R_ShutdownContext(); + RE_ShutdownContext(); } /* @@ -1549,7 +1549,7 @@ void R_DrawBeam( entity_t *e ) //=================================================================== static int -R_InitContext(void *win) +RE_InitContext(void *win) { char title[40] = {0}; @@ -1587,7 +1587,7 @@ qboolean Vkimp_CreateSurface(SDL_Window *window) } static qboolean -R_IsVsyncActive(void) +RE_IsVsyncActive(void) { if (r_vsync->value) { @@ -1599,7 +1599,7 @@ R_IsVsyncActive(void) } } -static int R_PrepareForWindow(void) +static int RE_PrepareForWindow(void) { if (SDL_Vulkan_LoadLibrary(NULL)) { @@ -1628,31 +1628,31 @@ GetRefAPI(refimport_t imp) refexport.api_version = API_VERSION; - refexport.BeginRegistration = R_BeginRegistration; - refexport.RegisterModel = R_RegisterModel; - refexport.RegisterSkin = R_RegisterSkin; - refexport.DrawFindPic = Draw_FindPic; - refexport.SetSky = R_SetSky; - refexport.EndRegistration = R_EndRegistration; + refexport.BeginRegistration = RE_BeginRegistration; + refexport.RegisterModel = RE_RegisterModel; + refexport.RegisterSkin = RE_RegisterSkin; + refexport.DrawFindPic = RE_Draw_FindPic; + refexport.SetSky = RE_SetSky; + refexport.EndRegistration = RE_EndRegistration; refexport.RenderFrame = RE_RenderFrame; - refexport.DrawGetPicSize = Draw_GetPicSize; - refexport.DrawPicScaled = Draw_PicScaled; - refexport.DrawStretchPic = Draw_StretchPic; - refexport.DrawCharScaled = Draw_CharScaled; - refexport.DrawTileClear = Draw_TileClear; - refexport.DrawFill = Draw_Fill; - refexport.DrawFadeScreen= Draw_FadeScreen; + refexport.DrawGetPicSize = RE_Draw_GetPicSize; + refexport.DrawPicScaled = RE_Draw_PicScaled; + refexport.DrawStretchPic = RE_Draw_StretchPic; + refexport.DrawCharScaled = RE_Draw_CharScaled; + refexport.DrawTileClear = RE_Draw_TileClear; + refexport.DrawFill = RE_Draw_Fill; + refexport.DrawFadeScreen= RE_Draw_FadeScreen; - refexport.DrawStretchRaw = Draw_StretchRaw; + refexport.DrawStretchRaw = RE_Draw_StretchRaw; - refexport.Init = R_Init; - refexport.IsVSyncActive = R_IsVsyncActive; - refexport.Shutdown = R_Shutdown; - refexport.InitContext = R_InitContext; - refexport.ShutdownContext = R_ShutdownContext; - refexport.PrepareForWindow = R_PrepareForWindow; + refexport.Init = RE_Init; + refexport.IsVSyncActive = RE_IsVsyncActive; + refexport.Shutdown = RE_Shutdown; + refexport.InitContext = RE_InitContext; + refexport.ShutdownContext = RE_ShutdownContext; + refexport.PrepareForWindow = RE_PrepareForWindow; refexport.SetPalette = RE_SetPalette; refexport.BeginFrame = RE_BeginFrame; diff --git a/src/client/refresh/vk/vk_rmisc.c b/src/client/refresh/vk/vk_rmisc.c index 307fec74..11526b97 100644 --- a/src/client/refresh/vk/vk_rmisc.c +++ b/src/client/refresh/vk/vk_rmisc.c @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* ================== -R_InitParticleTexture +RE_InitParticleTexture ================== */ static byte dottexture[8][8] = @@ -39,7 +39,7 @@ static byte dottexture[8][8] = {0,0,0,0,0,0,0,0}, }; -void R_InitParticleTexture (void) +void RE_InitParticleTexture (void) { int x,y,i; byte data[8][8][4]; diff --git a/src/client/refresh/vk/vk_warp.c b/src/client/refresh/vk/vk_warp.c index 5182561b..1bd82691 100644 --- a/src/client/refresh/vk/vk_warp.c +++ b/src/client/refresh/vk/vk_warp.c @@ -662,12 +662,12 @@ void R_DrawSkyBox (void) /* ============ -R_SetSky +RE_SetSky ============ */ // 3dstudio environment map names static char *suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"}; -void R_SetSky (char *name, float rotate, vec3_t axis) +void RE_SetSky (char *name, float rotate, vec3_t axis) { int i; char pathname[MAX_QPATH];