cvar_t vid_height = {CVAR_SAVE, "vid_height", "480", "resolution"};
cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32", "how many bits per pixel to render at (32 or 16, 32 is recommended)"};
cvar_t vid_refreshrate = {CVAR_SAVE, "vid_refreshrate", "60", "refresh rate to use, in hz (higher values flicker less, if supported by your monitor)"};
+cvar_t vid_userefreshrate = {CVAR_SAVE, "vid_userefreshrate", "0", "set this to 1 to make vid_refreshrate used, or to 0 to let the engine choose a sane default"};
cvar_t vid_stereobuffer = {CVAR_SAVE, "vid_stereobuffer", "0", "enables 'quad-buffered' stereo rendering for stereo shutterglasses, HMD (head mounted display) devices, or polarized stereo LCDs, if supported by your drivers"};
cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0", "sync to vertical blank, prevents 'tearing' (seeing part of one frame and part of another on the screen at the same time), automatically disabled when doing timedemo benchmarks"};
cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1", "desired color of white"};
cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1", "desired color of white"};
cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "1", "enables use of hardware gamma correction ramps if available (note: does not work very well on Windows2000 and above), values are 0 = off, 1 = attempt to use hardware gamma, 2 = use hardware gamma whether it works or not"};
+cvar_t v_glslgamma = {CVAR_SAVE, "v_glslgamma", "0", "enables use of GLSL to apply gamma correction ramps if available (note: overrides v_hwgamma)"};
cvar_t v_psycho = {0, "v_psycho", "0", "easter egg (does not work on Windows2000 or above)"};
// brand of graphics chip
int failed = false;
const dllfunction_t *func;
- Con_Printf("checking for %s... ", name);
+ Con_DPrintf("checking for %s... ", name);
for (func = funcs;func && func->name;func++)
*func->funcvariable = NULL;
if (disableparm && (COM_CheckParm(disableparm) || COM_CheckParm("-safe")))
{
- Con_Print("disabled by commandline\n");
+ Con_DPrint("disabled by commandline\n");
return false;
}
if (!(*func->funcvariable = (void *) GL_GetProcAddress(func->name)))
{
if (!silent)
- Con_Printf("OpenGL extension \"%s\" is missing function \"%s\" - broken driver!\n", name, func->name);
+ Con_DPrintf("OpenGL extension \"%s\" is missing function \"%s\" - broken driver!\n", name, func->name);
failed = true;
}
}
// delay the return so it prints all missing functions
if (failed)
return false;
- Con_Print("enabled\n");
+ Con_DPrint("enabled\n");
return true;
}
else
{
- Con_Print("not detected\n");
+ Con_DPrint("not detected\n");
return false;
}
}
if (!GL_CheckExtension("OpenGL 1.1.0", opengl110funcs, NULL, false))
Sys_Error("OpenGL 1.1.0 functions not found");
- Con_Printf("GL_VENDOR: %s\n", gl_vendor);
- Con_Printf("GL_RENDERER: %s\n", gl_renderer);
- Con_Printf("GL_VERSION: %s\n", gl_version);
- Con_Printf("GL_EXTENSIONS: %s\n", gl_extensions);
- Con_Printf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions);
-
CHECKGLERROR
qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max_texture_size);
- Con_Print("Checking OpenGL extensions...\n");
+ Con_DPrint("Checking OpenGL extensions...\n");
// COMMANDLINEOPTION: GL: -nodrawrangeelements disables GL_EXT_draw_range_elements (renders faster)
if (!GL_CheckExtension("glDrawRangeElements", drawrangeelementsfuncs, "-nodrawrangeelements", true))
static int gamma_forcenextframe = false;
static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3], cachecontrastboost;
static int cachecolorenable, cachehwgamma;
+
+unsigned int vid_gammatables_serial = 0; // so other subsystems can poll if gamma parameters have changed
+qboolean vid_gammatables_trivial = true;
+void VID_BuildGammaTables(unsigned short *ramps, int rampsize)
+{
+ if (cachecolorenable)
+ {
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], cachecontrastboost, ramps, rampsize);
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], cachecontrastboost, ramps + rampsize, rampsize);
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], cachecontrastboost, ramps + rampsize*2, rampsize);
+ }
+ else
+ {
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps, rampsize);
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps + rampsize, rampsize);
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps + rampsize*2, rampsize);
+ }
+
+ // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
+ // immensely butchered it to work with variable framerates and fit in with
+ // the rest of darkplaces.
+ if (v_psycho.integer)
+ {
+ int x, y;
+ float t;
+ static float n[3], nd[3], nt[3];
+ static int init = true;
+ unsigned short *ramp;
+ gamma_forcenextframe = true;
+ if (init)
+ {
+ init = false;
+ for (x = 0;x < 3;x++)
+ {
+ n[x] = lhrandom(0, 1);
+ nd[x] = (rand()&1)?-0.25:0.25;
+ nt[x] = lhrandom(1, 8.2);
+ }
+ }
+
+ for (x = 0;x < 3;x++)
+ {
+ nt[x] -= cl.realframetime;
+ if (nt[x] < 0)
+ {
+ nd[x] = -nd[x];
+ nt[x] += lhrandom(1, 8.2);
+ }
+ n[x] += nd[x] * cl.realframetime;
+ n[x] -= floor(n[x]);
+ }
+
+ for (x = 0, ramp = ramps;x < 3;x++)
+ for (y = 0, t = n[x] - 0.75f;y < rampsize;y++, t += 0.75f * (2.0f / rampsize))
+ *ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f);
+ }
+}
+
void VID_UpdateGamma(qboolean force, int rampsize)
{
cvar_t *c;
float f;
int wantgamma;
+ qboolean gamma_changed = false;
// LordHavoc: don't mess with gamma tables if running dedicated
if (cls.state == ca_dedicated)
return;
- wantgamma = (vid_activewindow ? v_hwgamma.integer : 0);
+ wantgamma = v_hwgamma.integer;
+ if(r_glsl.integer && v_glslgamma.integer)
+ wantgamma = 0;
+ if(!vid_activewindow)
+ wantgamma = 0;
#define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f);
BOUNDCVAR(v_gamma, 0.1, 5);
BOUNDCVAR(v_contrast, 1, 5);
BOUNDCVAR(v_color_white_b, 1, 5);
#undef BOUNDCVAR
- if (force || v_psycho.integer)
- gamma_forcenextframe = true;
-#define GAMMACHECK(cache, value) if (cache != (value)) gamma_forcenextframe = true;cache = (value)
- GAMMACHECK(cachehwgamma , wantgamma);
+ // set vid_gammatables_trivial to true if the current settings would generate the identity gamma table
+ vid_gammatables_trivial = false;
+ if(v_psycho.integer == 0)
+ if(v_contrastboost.value == 1)
+ {
+ if(v_color_enable.integer)
+ {
+ if(v_color_black_r.value == 0)
+ if(v_color_black_g.value == 0)
+ if(v_color_black_b.value == 0)
+ if(fabs(v_color_grey_r.value - 0.5) < 1e-6)
+ if(fabs(v_color_grey_g.value - 0.5) < 1e-6)
+ if(fabs(v_color_grey_b.value - 0.5) < 1e-6)
+ if(v_color_white_r.value == 1)
+ if(v_color_white_g.value == 1)
+ if(v_color_white_b.value == 1)
+ vid_gammatables_trivial = true;
+ }
+ else
+ {
+ if(v_gamma.value == 1)
+ if(v_contrast.value == 1)
+ if(v_brightness.value == 0)
+ vid_gammatables_trivial = true;
+ }
+ }
+
+#define GAMMACHECK(cache, value) if (cache != (value)) gamma_changed = true;cache = (value)
+ if(v_psycho.integer)
+ gamma_changed = true;
GAMMACHECK(cachegamma , v_gamma.value);
GAMMACHECK(cachecontrast , v_contrast.value);
GAMMACHECK(cachebrightness , v_brightness.value);
GAMMACHECK(cachewhite[0] , v_color_white_r.value);
GAMMACHECK(cachewhite[1] , v_color_white_g.value);
GAMMACHECK(cachewhite[2] , v_color_white_b.value);
+
+ if(gamma_changed)
+ ++vid_gammatables_serial;
+
+ GAMMACHECK(cachehwgamma , wantgamma);
#undef GAMMACHECK
- if (!gamma_forcenextframe)
+ if (!force && !gamma_forcenextframe && !gamma_changed)
return;
gamma_forcenextframe = false;
VID_GetGamma(vid_systemgammaramps, vid_gammarampsize);
}
- if (cachecolorenable)
- {
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], cachecontrastboost, vid_gammaramps, rampsize);
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], cachecontrastboost, vid_gammaramps + vid_gammarampsize, rampsize);
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], cachecontrastboost, vid_gammaramps + vid_gammarampsize*2, rampsize);
- }
- else
- {
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, vid_gammaramps, rampsize);
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, vid_gammaramps + vid_gammarampsize, rampsize);
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, vid_gammaramps + vid_gammarampsize*2, rampsize);
- }
-
- // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
- // immensely butchered it to work with variable framerates and fit in with
- // the rest of darkplaces.
- if (v_psycho.integer)
- {
- int x, y;
- float t;
- static float n[3], nd[3], nt[3];
- static int init = true;
- unsigned short *ramp;
- gamma_forcenextframe = true;
- if (init)
- {
- init = false;
- for (x = 0;x < 3;x++)
- {
- n[x] = lhrandom(0, 1);
- nd[x] = (rand()&1)?-0.25:0.25;
- nt[x] = lhrandom(1, 8.2);
- }
- }
-
- for (x = 0;x < 3;x++)
- {
- nt[x] -= cl.realframetime;
- if (nt[x] < 0)
- {
- nd[x] = -nd[x];
- nt[x] += lhrandom(1, 8.2);
- }
- n[x] += nd[x] * cl.realframetime;
- n[x] -= floor(n[x]);
- }
-
- for (x = 0, ramp = vid_gammaramps;x < 3;x++)
- for (y = 0, t = n[x] - 0.75f;y < vid_gammarampsize;y++, t += 0.75f * (2.0f / vid_gammarampsize))
- *ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f);
- }
+ VID_BuildGammaTables(vid_gammaramps, vid_gammarampsize);
// set vid_hardwaregammasupported to true if VID_SetGamma succeeds, OR if vid_hwgamma is >= 2 (forced gamma - ignores driver return value)
Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps, vid_gammarampsize) || cachehwgamma >= 2);
Cvar_RegisterVariable(&v_color_white_b);
Cvar_RegisterVariable(&v_hwgamma);
+ Cvar_RegisterVariable(&v_glslgamma);
Cvar_RegisterVariable(&v_psycho);
Cvar_RegisterVariable(&vid_height);
Cvar_RegisterVariable(&vid_bitsperpixel);
Cvar_RegisterVariable(&vid_refreshrate);
+ Cvar_RegisterVariable(&vid_userefreshrate);
Cvar_RegisterVariable(&vid_stereobuffer);
Cvar_RegisterVariable(&vid_vsync);
Cvar_RegisterVariable(&vid_mouse);
int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
{
cl_ignoremousemoves = 2;
- Con_Printf("Video: %s %dx%dx%dx%dhz%s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, refreshrate, stereobuffer ? " stereo" : "");
- if (VID_InitMode(fullscreen, width, height, bpp, refreshrate, stereobuffer))
+ Con_Printf("Initialized Video Mode: %s %dx%dx%dx%dhz%s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, refreshrate, stereobuffer ? " stereo" : "");
+ if (VID_InitMode(fullscreen, width, height, bpp, vid_userefreshrate.integer ? max(1, refreshrate) : 0, stereobuffer))
{
vid.fullscreen = fullscreen;
vid.width = width;
vid.bitsperpixel = bpp;
vid.refreshrate = refreshrate;
vid.stereobuffer = stereobuffer;
+ vid.userefreshrate = vid_userefreshrate.integer;
Cvar_SetValueQuick(&vid_fullscreen, fullscreen);
Cvar_SetValueQuick(&vid_width, width);
Cvar_SetValueQuick(&vid_height, height);
Cvar_SetValueQuick(&vid_bitsperpixel, bpp);
- Cvar_SetValueQuick(&vid_refreshrate, refreshrate);
+ if(vid_userefreshrate.integer)
+ Cvar_SetValueQuick(&vid_refreshrate, refreshrate);
Cvar_SetValueQuick(&vid_stereobuffer, stereobuffer);
return true;
}
Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]);
}
- Con_Print("Starting video system\n");
success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer);
if (!success)
{
projects / xonotic / darkplaces.git / blobdiff