Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix incompatible functions in renderergl2
Some checks failed
CodeQL / Analyze (push) Waiting to run
Details
Build branch / build-all (push) Failing after 17s
Details

Browse source
This commit is contained in:
smallmodel 2025-01-28 21:52:58 +01:00
parent 1cabf5c31e
commit e66fd28831
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
4 changed files with 42 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
code/renderergl2/tr_backend.c
View file

@ -1878,6 +1878,17 @@ void RB_ExecuteRenderCommands( const void *data ) {
/*
=============
RE_StretchRaw2
=============
*/
void RE_StretchRaw2 (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
RE_StretchRaw(x, y, w, h, cols, rows, data, 0, qtrue);
}
/*
==================
RB_RenderSpriteSurfList

11
code/renderergl2/tr_init.c
View file

@ -1937,6 +1937,7 @@ RE_GetGraphicsInfo
const char* RE_GetGraphicsInfo() {
// FIXME: unimplemented (GL2)
// Looks like it's unused anyway
return "";
}
//=========================
@ -1986,16 +1987,16 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
re.ModelBounds = R_ModelBounds;
re.ClearScene = RE_ClearScene;
re.AddRefEntityToScene = RE_AddRefEntityToScene;
re.AddPolyToScene = RE_AddPolyToScene;
re.AddRefEntityToScene = RE_AddRefEntityToScene2;
re.AddPolyToScene = RE_AddPolyToScene2;
re.LightForPoint = R_LightForPoint;
re.AddLightToScene = RE_AddLightToScene;
re.AddLightToScene = RE_AddLightToScene2;
re.AddAdditiveLightToScene = RE_AddAdditiveLightToScene;
re.RenderScene = RE_RenderScene;
re.SetColor = RE_SetColor;
re.DrawStretchPic = RE_StretchPic;
re.DrawStretchRaw = RE_StretchRaw;
re.DrawStretchRaw = RE_StretchRaw2;
re.UploadCinematic = RE_UploadCinematic;
re.RegisterFont = RE_RegisterFont;
@ -2037,7 +2038,7 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
re.SetColor = Draw_SetColor;
re.DrawStretchPic = Draw_StretchPic;
re.DrawStretchPic2 = Draw_StretchPic2;
re.DrawStretchRaw = RE_StretchRaw;
re.DrawStretchRaw = RE_StretchRaw2;
re.DebugLine = R_DebugLine;
re.DrawTilePic = Draw_TilePic;
re.DrawTilePicOffset = Draw_TilePicOffset;

6
code/renderergl2/tr_local.h
View file

@ -2962,7 +2962,8 @@ void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, fl
void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
void RE_BeginScene( const refdef_t *fd );
void RE_RenderScene( const refdef_t *fd );
void RE_EndScene( void );
void RE_EndScene(void);
void RE_AddRefEntityToScene2(const refEntity_t* ent, int parentEntityNumber);
/*
=============================================================
@ -3024,6 +3025,7 @@ void AddBox(float x, float y, float w, float h);
void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
void RE_Scissor(int x, int y, int width, int height);
void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
void RE_StretchRaw2(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
/*
=============================================================
@ -3102,7 +3104,7 @@ void RE_AddRefSpriteToScene(const refEntity_t* ent);
void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
refEntity_t* RE_GetRenderEntity(int entityNumber);
qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type);
/*
============================================================

21
code/renderergl2/tr_scene.c
View file

@ -700,6 +700,27 @@ void RE_RenderScene( const refdef_t *fd ) {
// OPENMOHAA-specific stuff
//
/*
=====================
RE_AddLightToScene2
=====================
*/
void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type) {
RE_AddDynamicLightToScene(org, intensity, r, g, b, qfalse);
}
/*
=====================
RE_AddRefEntityToScene2
=====================
*/
void RE_AddRefEntityToScene2( const refEntity_t *ent, int parentEntityNumber ) {
RE_AddRefEntityToScene(ent);
}
void RE_AddRefSpriteToScene(const refEntity_t* ent) {
refSprite_t* spr;
int i;