yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch GL_ARB_texture_env_combine to our new probing logic

Browse source
This commit is contained in:
Yamagi Burmeister 2016-08-06 15:32:08 +02:00
parent 5840bd570b
commit 698e2a26ba
3 changed files with 12 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client/refresh/header/local.h
View file

@ -218,7 +218,7 @@ extern cvar_t *gl_palettedtexture;
extern cvar_t *gl_multitexture;
extern cvar_t *gl_pointparameters;
extern cvar_t *gl_ext_compiled_vertex_array;
extern cvar_t *gl_ext_mtexcombine;
extern cvar_t *gl_mtexcombine;
extern cvar_t *gl_particle_min_size;
extern cvar_t *gl_particle_max_size;
@ -379,20 +379,15 @@ typedef struct
// ----
qboolean anisotropic;
qboolean mtexcombine;
qboolean multitexture;
qboolean npottextures;
qboolean palettedtexture;
qboolean pointparameters;
qboolean mtexcombine;
// ----
float max_anisotropy;
} glconfig_t;
typedef struct

38
src/client/refresh/r_main.c
View file

@ -100,7 +100,7 @@ cvar_t *gl_palettedtexture;
cvar_t *gl_multitexture;
cvar_t *gl_pointparameters;
cvar_t *gl_ext_compiled_vertex_array;
cvar_t *gl_ext_mtexcombine;
cvar_t *gl_mtexcombine;
cvar_t *gl_bitdepth;
cvar_t *gl_drawbuffer;
@ -1260,7 +1260,7 @@ R_Register(void)
gl_multitexture = Cvar_Get("gl_multitexture", "0", CVAR_ARCHIVE);
gl_pointparameters = Cvar_Get("gl_pointparameters", "1", CVAR_ARCHIVE);
gl_ext_compiled_vertex_array = Cvar_Get("gl_ext_compiled_vertex_array", "1", CVAR_ARCHIVE);
gl_ext_mtexcombine = Cvar_Get("gl_ext_mtexcombine", "1", CVAR_ARCHIVE);
gl_mtexcombine = Cvar_Get("gl_mtexcombine", "1", CVAR_ARCHIVE);
gl_drawbuffer = Cvar_Get("gl_drawbuffer", "GL_BACK", 0);
gl_swapinterval = Cvar_Get("gl_swapinterval", "1", CVAR_ARCHIVE);
@ -1554,7 +1554,6 @@ R_Init(void *hinstance, void *hWnd)
/* Non power of two textures */
VID_Printf(PRINT_ALL, " - Non power of two textures: ");
if (strstr(gl_config.extensions_string, "GL_ARB_texture_non_power_of_two"))
{
gl_config.npottextures = true;
@ -1568,46 +1567,27 @@ R_Init(void *hinstance, void *hWnd)
// ----
gl_config.mtexcombine = false;
/* Multi texturing combine */
VID_Printf(PRINT_ALL, " - Multi texturing combine: ");
if (strstr(gl_config.extensions_string, "GL_ARB_texture_env_combine"))
{
if (gl_ext_mtexcombine->value)
if (gl_mtexcombine->value)
{
VID_Printf(PRINT_ALL, "...using GL_ARB_texture_env_combine\n");
gl_config.mtexcombine = true;
VID_Printf(PRINT_ALL, "Okay");
}
else
{
VID_Printf(PRINT_ALL, "...ignoring GL_ARB_texture_env_combine\n");
VID_Printf(PRINT_ALL, "Disabled\n");
}
}
else
{
VID_Printf(PRINT_ALL, "...GL_ARB_texture_env_combine not found\n");
VID_Printf(PRINT_ALL, "Failed\n");
}
// ----
if (!gl_config.mtexcombine)
{
if (strstr(gl_config.extensions_string, "GL_EXT_texture_env_combine"))
{
if (gl_ext_mtexcombine->value)
{
VID_Printf(PRINT_ALL, "...using GL_EXT_texture_env_combine\n");
gl_config.mtexcombine = true;
}
else
{
VID_Printf(PRINT_ALL, "...ignoring GL_EXT_texture_env_combine\n");
}
}
else
{
VID_Printf(PRINT_ALL, "...GL_EXT_texture_env_combine not found\n");
}
}
// --------
R_SetDefaultState();

2
src/client/refresh/r_mesh.c
View file

@ -721,7 +721,7 @@ R_DrawAliasModel(entity_t *e)
/* Apply gl_overbrightbits to the mesh. If we don't do this they will appear slightly dimmer relative to
walls. Also note that gl_overbrightbits is only applied to walls when gl_ext_mtexcombine is set to 1,
walls. Also note that gl_overbrightbits is only applied to walls when gl_mtexcombine is set to 1,
so we'll also want to check that; otherwise we'll end up in the reverse situation and the meshes will
appear too bright. */
if (gl_config.mtexcombine && gl_overbrightbits->value)