RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ref: simplify gldebug switchcase in output function, kinda fix const qualifiers

Browse Source
This commit is contained in:
Alibek Omarov
2022-05-29 04:00:19 +03:00
parent dd29e705f8
commit 5fb4edeb36
5 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ref_gl/gl-wes-v2

Submodule ref_gl/gl-wes-v2 updated: 11384d5cf6...7f567393d4

20
ref_gl/gl_opengl.c
View File

@@ -273,8 +273,6 @@ static void APIENTRY GL_DebugOutput( GLuint source, GLuint type, GLuint id, GLui
gEngfuncs.Con_Printf( S_OPENGL_ERROR "%s\n", message );
break;
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
gEngfuncs.Con_Printf( S_OPENGL_WARN "%s\n", message );
break;
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
gEngfuncs.Con_Printf( S_OPENGL_WARN "%s\n", message );
break;
@@ -282,8 +280,6 @@ static void APIENTRY GL_DebugOutput( GLuint source, GLuint type, GLuint id, GLui
gEngfuncs.Con_Reportf( S_OPENGL_WARN "%s\n", message );
break;
case GL_DEBUG_TYPE_PERFORMANCE_ARB:
gEngfuncs.Con_Printf( S_OPENGL_NOTE "%s\n", message );
break;
case GL_DEBUG_TYPE_OTHER_ARB:
default:
gEngfuncs.Con_Printf( S_OPENGL_NOTE "%s\n", message );
@@ -498,10 +494,10 @@ void R_RenderInfo_f( void )
if( glConfig.wrapper == GLES_WRAPPER_GL4ES )
{
const char *vendor = pglGetString( GL_VENDOR | 0x10000 );
const char *renderer = pglGetString( GL_RENDERER | 0x10000 );
const char *version = pglGetString( GL_VERSION | 0x10000 );
const char *extensions = pglGetString( GL_EXTENSIONS | 0x10000 );
const char *vendor = (const char *)pglGetString( GL_VENDOR | 0x10000 );
const char *renderer = (const char *)pglGetString( GL_RENDERER | 0x10000 );
const char *version = (const char *)pglGetString( GL_VERSION | 0x10000 );
const char *extensions = (const char *)pglGetString( GL_EXTENSIONS | 0x10000 );
if( vendor )
gEngfuncs.Con_Printf( "GL4ES_VENDOR: %s\n", vendor );
@@ -644,10 +640,10 @@ void GL_InitExtensionsBigGL( void )
// gl4es may be used system-wide
if( Q_stristr( glConfig.renderer_string, "gl4es" ))
{
const char *vendor = pglGetString( GL_VENDOR | 0x10000 );
const char *renderer = pglGetString( GL_RENDERER | 0x10000 );
const char *version = pglGetString( GL_VERSION | 0x10000 );
const char *extensions = pglGetString( GL_EXTENSIONS | 0x10000 );
const char *vendor = (const char *)pglGetString( GL_VENDOR | 0x10000 );
const char *renderer = (const char *)pglGetString( GL_RENDERER | 0x10000 );
const char *version = (const char *)pglGetString( GL_VERSION | 0x10000 );
const char *extensions = (const char *)pglGetString( GL_EXTENSIONS | 0x10000 );
glConfig.wrapper = GLES_WRAPPER_GL4ES;
}

3
ref_gl/gl_studio.c
View File

@@ -34,7 +34,8 @@ typedef struct
model_t *model;
} player_model_t;
cvar_t r_shadows = { "r_shadows", "0", 0 };
// never gonna change, just shut up const warning
cvar_t r_shadows = { (char *)"r_shadows", (char *)"0", 0 };
static vec3_t hullcolor[8] =
{

4
ref_soft/r_glblit.c
View File

@@ -58,8 +58,6 @@ static void APIENTRY GL_DebugOutput( GLuint source, GLuint type, GLuint id, GLui
gEngfuncs.Con_Printf( S_OPENGL_ERROR "%s\n", message );
break;
case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
gEngfuncs.Con_Printf( S_OPENGL_WARN "%s\n", message );
break;
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
gEngfuncs.Con_Printf( S_OPENGL_WARN "%s\n", message );
break;
@@ -67,8 +65,6 @@ static void APIENTRY GL_DebugOutput( GLuint source, GLuint type, GLuint id, GLui
gEngfuncs.Con_Reportf( S_OPENGL_WARN "%s\n", message );
break;
case GL_DEBUG_TYPE_PERFORMANCE_ARB:
gEngfuncs.Con_Printf( S_OPENGL_NOTE "%s\n", message );
break;
case GL_DEBUG_TYPE_OTHER_ARB:
default:
gEngfuncs.Con_Printf( S_OPENGL_NOTE "%s\n", message );

2
ref_soft/r_studio.c
View File

@@ -34,7 +34,7 @@ typedef struct
model_t *model;
} player_model_t;
cvar_t r_shadows = { "r_shadows", "0", 0 };
cvar_t r_shadows = { (char *)"r_shadows", (char *)"0", 0 };
static vec3_t hullcolor[8] =
{