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

Nuke V_CheckGamma, moving its sole contribution to VID_UpdateGamma in vid.c

Browse source
This commit is contained in:
Bill Currie 2001-05-24 15:48:39 +00:00
parent d87d374fcf
commit a3518d44ed
7 changed files with 7 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/video/targets/vid.c
View file

@ -143,6 +143,8 @@ VID_UpdateGamma (cvar_t *vid_gamma)
if (vid_gamma->flags & CVAR_ROM) // System gamma unavailable if (vid_gamma->flags & CVAR_ROM) // System gamma unavailable
return; return;
vid.recalc_refdef = 1; // force a surface cache flush
if (vid_gamma_avail && vid_system_gamma->int_val) { // Have system, use it if (vid_gamma_avail && vid_system_gamma->int_val) { // Have system, use it
Con_DPrintf ("Setting hardware gamma to %g\n", gamma); Con_DPrintf ("Setting hardware gamma to %g\n", gamma);
VID_BuildGammaTable (1.0); // hardware gamma wants a linear palette VID_BuildGammaTable (1.0); // hardware gamma wants a linear palette

6
nq/source/gl_view.c
View file

@ -49,8 +49,6 @@ extern double host_frametime;
extern byte gammatable[256]; extern byte gammatable[256];
extern qboolean V_CheckGamma (void);
extern cvar_t *cl_cshift_powerup; extern cvar_t *cl_cshift_powerup;
byte ramps[3][256]; byte ramps[3][256];
@ -139,7 +137,6 @@ V_UpdatePalette (void)
{ {
int i, j; int i, j;
qboolean new; qboolean new;
qboolean force;
V_CalcPowerupCshift (); V_CalcPowerupCshift ();
@ -168,8 +165,7 @@ V_UpdatePalette (void)
if (cl.cshifts[CSHIFT_BONUS].percent < 0) if (cl.cshifts[CSHIFT_BONUS].percent < 0)
cl.cshifts[CSHIFT_BONUS].percent = 0; cl.cshifts[CSHIFT_BONUS].percent = 0;
force = V_CheckGamma (); if (!new)
if (!new && !force)
return; return;
V_CalcBlend (); V_CalcBlend ();

18
nq/source/r_view.c
View file

@ -225,24 +225,6 @@ V_DriftPitch (void)
*/ */
qboolean
V_CheckGamma (void)
{
static float oldgamma;
if (vid_gamma) { // might get called before vid_gamma gets set
if (oldgamma == vid_gamma->value)
return false;
oldgamma = vid_gamma->value;
}
vid.recalc_refdef = 1; // force a surface cache flush
return true;
}
void void
V_ParseDamage (void) V_ParseDamage (void)
{ {

6
nq/source/sw_view.c
View file

@ -42,8 +42,6 @@ extern cvar_t *cl_cshift_powerup;
extern byte gammatable[256]; extern byte gammatable[256];
qboolean V_CheckGamma (void);
extern void V_CalcGlowCshift (void); extern void V_CalcGlowCshift (void);
@ -65,7 +63,6 @@ V_UpdatePalette (void)
byte *basepal, *newpal; byte *basepal, *newpal;
byte pal[768]; byte pal[768];
int r, g, b; int r, g, b;
qboolean force;
V_CalcPowerupCshift (); V_CalcPowerupCshift ();
@ -94,8 +91,7 @@ V_UpdatePalette (void)
if (cl.cshifts[CSHIFT_BONUS].percent < 0) if (cl.cshifts[CSHIFT_BONUS].percent < 0)
cl.cshifts[CSHIFT_BONUS].percent = 0; cl.cshifts[CSHIFT_BONUS].percent = 0;
force = V_CheckGamma (); if (!new)
if (!new && !force)
return; return;
basepal = vid_basepal; basepal = vid_basepal;

6
qw/source/gl_view.c
View file

@ -50,8 +50,6 @@ extern double host_frametime;
extern byte gammatable[256]; extern byte gammatable[256];
extern qboolean V_CheckGamma (void);
extern cvar_t *cl_cshift_powerup; extern cvar_t *cl_cshift_powerup;
byte ramps[3][256]; byte ramps[3][256];
@ -141,7 +139,6 @@ V_UpdatePalette (void)
{ {
int i, j; int i, j;
qboolean new; qboolean new;
qboolean force;
V_CalcPowerupCshift (); V_CalcPowerupCshift ();
@ -170,8 +167,7 @@ V_UpdatePalette (void)
if (cl.cshifts[CSHIFT_BONUS].percent < 0) if (cl.cshifts[CSHIFT_BONUS].percent < 0)
cl.cshifts[CSHIFT_BONUS].percent = 0; cl.cshifts[CSHIFT_BONUS].percent = 0;
force = V_CheckGamma (); if (!new)
if (!new && !force)
return; return;
V_CalcBlend (); V_CalcBlend ();

18
qw/source/r_view.c
View file

@ -257,24 +257,6 @@ V_DriftPitch (void)
*/ */
qboolean
V_CheckGamma (void)
{
static float oldgamma;
if (vid_gamma) { // might get called before vid_gamma gets set
if (oldgamma == vid_gamma->value)
return false;
oldgamma = vid_gamma->value;
}
vid.recalc_refdef = 1; // force a surface cache flush
return true;
}
void void
V_ParseDamage (void) V_ParseDamage (void)
{ {

6
qw/source/sw_view.c
View file

@ -43,8 +43,6 @@ extern cvar_t *cl_cshift_powerup;
extern byte gammatable[256]; extern byte gammatable[256];
qboolean V_CheckGamma (void);
extern void V_CalcGlowCshift (void); extern void V_CalcGlowCshift (void);
@ -67,7 +65,6 @@ V_UpdatePalette (void)
byte *basepal, *newpal; byte *basepal, *newpal;
byte pal[768]; byte pal[768];
int r, g, b; int r, g, b;
qboolean force;
V_CalcPowerupCshift (); V_CalcPowerupCshift ();
@ -96,8 +93,7 @@ V_UpdatePalette (void)
if (cl.cshifts[CSHIFT_BONUS].percent < 0) if (cl.cshifts[CSHIFT_BONUS].percent < 0)
cl.cshifts[CSHIFT_BONUS].percent = 0; cl.cshifts[CSHIFT_BONUS].percent = 0;
force = V_CheckGamma (); if (!new)
if (!new && !force)
return; return;
basepal = vid_basepal; basepal = vid_basepal;