X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_shared.c;h=8bd1851e23c86a725d200fe65314838db28f44ea;hp=39368f7d5d8292d8fd63519b98430fde36e90a7a;hb=bf7fdc26371e2823650c8af6d78ef1e28513f7eb;hpb=a46f1cc0761f637f0bf92fe49f1fbcd59df7dc50 diff --git a/vid_shared.c b/vid_shared.c index 39368f7d..8bd1851e 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -71,13 +71,14 @@ cvar_t vid_width = {CVAR_SAVE, "vid_width", "640", "resolution"}; 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_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 vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in windowed mode (fullscreen always does)"}; cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"}; cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"}; cvar_t gl_combine = {0, "gl_combine", "1", "faster rendering by using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"}; -cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each frame render (can help with strange input or video lag problems on some machines)"}; +cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"}; cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1", "inverse gamma correction value, a brightness effect that does not affect white or black, and tends to make the image grey and dull"}; cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1", "brightness of white (values above 1 give a brighter image with increased color saturation, unlike v_gamma)"}; @@ -92,7 +93,7 @@ cvar_t v_color_grey_b = {CVAR_SAVE, "v_color_grey_b", "0.5", "desired color of g cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1", "desired color of white"}; 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)"}; +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_psycho = {0, "v_psycho", "0", "easter egg (does not work on Windows2000 or above)"}; // brand of graphics chip @@ -643,6 +644,7 @@ void VID_CheckExtensions(void) 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"); @@ -664,7 +666,14 @@ void VID_CheckExtensions(void) // COMMANDLINEOPTION: GL: -notexture3d disables GL_EXT_texture3D (required for spherical lights, otherwise they render as a column) if ((gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false))) + { qglGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &gl_max_3d_texture_size); + if (gl_max_3d_texture_size < 32) + { + gl_texture3d = false; + Con_Printf("GL_EXT_texture3D reported bogus GL_MAX_3D_TEXTURE_SIZE, disabled\n"); + } + } // COMMANDLINEOPTION: GL: -nocubemap disables GL_ARB_texture_cube_map (required for bumpmapping) if ((gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false))) qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, &gl_max_cube_map_texture_size); @@ -692,6 +701,7 @@ void VID_CheckExtensions(void) if ((gl_support_shading_language_100 = GL_CheckExtension("GL_ARB_shading_language_100", NULL, "-noshadinglanguage100", false))) if ((gl_support_vertex_shader = GL_CheckExtension("GL_ARB_vertex_shader", vertexshaderfuncs, "-novertexshader", false))) gl_support_fragment_shader = GL_CheckExtension("GL_ARB_fragment_shader", NULL, "-nofragmentshader", false); + CHECKGLERROR } void Force_CenterView_f (void) @@ -699,6 +709,7 @@ void Force_CenterView_f (void) cl.viewangles[PITCH] = 0; } +static int gamma_forcenextframe = false; static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3]; static int cachecolorenable, cachehwgamma; #define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f); @@ -706,16 +717,15 @@ void VID_UpdateGamma(qboolean force, int rampsize) { cvar_t *c; float f; - static int forcenextframe = false; // LordHavoc: don't mess with gamma tables if running dedicated if (cls.state == ca_dedicated) return; if (!force - && !forcenextframe + && !gamma_forcenextframe && !v_psycho.integer - && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer) + && cachehwgamma == (vid_activewindow ? v_hwgamma.integer : 0) && v_gamma.value == cachegamma && v_contrast.value == cachecontrast && v_brightness.value == cachebrightness @@ -731,9 +741,24 @@ void VID_UpdateGamma(qboolean force, int rampsize) && cachewhite[2] == v_color_white_b.value) return; - forcenextframe = false; - - if (vid_activewindow && v_hwgamma.integer) + BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value; + BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value; + BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value; + BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value; + BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value; + BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value; + BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value; + BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value; + BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value; + BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value; + BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value; + BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value; + cachecolorenable = v_color_enable.integer; + cachehwgamma = vid_activewindow ? v_hwgamma.integer : 0; + + gamma_forcenextframe = false; + + if (cachehwgamma) { if (!vid_usinghwgamma) { @@ -743,29 +768,12 @@ void VID_UpdateGamma(qboolean force, int rampsize) vid_gammarampsize = rampsize; if (vid_gammaramps) Z_Free(vid_gammaramps); - vid_gammaramps = Z_Malloc(6 * vid_gammarampsize * sizeof(unsigned short)); + vid_gammaramps = (unsigned short *)Z_Malloc(6 * vid_gammarampsize * sizeof(unsigned short)); vid_systemgammaramps = vid_gammaramps + 3 * vid_gammarampsize; } - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_GetGamma(vid_systemgammaramps, vid_gammarampsize)); - if (!vid_hardwaregammasupported.integer) - return; + VID_GetGamma(vid_systemgammaramps, vid_gammarampsize); } - BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value; - BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value; - BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value; - BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value; - BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value; - BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value; - BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value; - BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value; - BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value; - BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value; - BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value; - BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value; - cachecolorenable = v_color_enable.integer; - cachehwgamma = v_hwgamma.integer; - if (cachecolorenable) { BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize); @@ -789,7 +797,7 @@ void VID_UpdateGamma(qboolean force, int rampsize) static float n[3], nd[3], nt[3]; static int init = true; unsigned short *ramp; - forcenextframe = true; + gamma_forcenextframe = true; if (init) { init = false; @@ -803,31 +811,41 @@ void VID_UpdateGamma(qboolean force, int rampsize) for (x = 0;x < 3;x++) { - nt[x] -= host_realframetime; + nt[x] -= cl.realframetime; if (nt[x] < 0) { nd[x] = -nd[x]; nt[x] += lhrandom(1, 8.2); } - n[x] += nd[x] * host_realframetime; + 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++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f; + *ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f); } - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(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); // if custom gamma ramps failed (Windows stupidity), restore to system gamma if(!vid_hardwaregammasupported.integer) { - VID_RestoreSystemGamma(); - Cvar_SetValueQuick(&vid_hardwaregammasupported, false); + if (vid_usinghwgamma) + { + vid_usinghwgamma = false; + VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); + } } } else - VID_RestoreSystemGamma(); + { + if (vid_usinghwgamma) + { + vid_usinghwgamma = false; + VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); + } + } } void VID_RestoreSystemGamma(void) @@ -836,6 +854,8 @@ void VID_RestoreSystemGamma(void) { vid_usinghwgamma = false; Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps, vid_gammarampsize)); + // force gamma situation to be reexamined next frame + gamma_forcenextframe = true; } } @@ -866,6 +886,7 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&vid_height); Cvar_RegisterVariable(&vid_bitsperpixel); Cvar_RegisterVariable(&vid_refreshrate); + Cvar_RegisterVariable(&vid_stereobuffer); Cvar_RegisterVariable(&vid_vsync); Cvar_RegisterVariable(&vid_mouse); Cvar_RegisterVariable(&vid_minwidth); @@ -878,21 +899,23 @@ void VID_Shared_Init(void) Cvar_Set("gl_combine", "0"); } -int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate) +int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { - Con_Printf("Video: %s %dx%dx%dx%dhz\n", fullscreen ? "fullscreen" : "window", width, height, bpp, refreshrate); - if (VID_InitMode(fullscreen, width, height, bpp, refreshrate)) + 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)) { vid.fullscreen = fullscreen; vid.width = width; vid.height = height; vid.bitsperpixel = bpp; vid.refreshrate = refreshrate; + vid.stereobuffer = stereobuffer; 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); + Cvar_SetValueQuick(&vid_stereobuffer, stereobuffer); return true; } else @@ -924,10 +947,10 @@ void VID_Restart_f(void) vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer); VID_CloseSystems(); VID_Shutdown(); - if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer)) + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer)) { Con_Print("Video mode change failed\n"); - if (!VID_Mode(vid.fullscreen, vid.width, vid.height, vid.bitsperpixel, vid.refreshrate)) + if (!VID_Mode(vid.fullscreen, vid.width, vid.height, vid.bitsperpixel, vid.refreshrate, vid.stereobuffer)) Sys_Error("Unable to restore to last working video mode"); } VID_OpenSystems(); @@ -969,17 +992,19 @@ void VID_Start(void) } Con_Print("Starting video system\n"); - success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer); + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer); if (!success) { Con_Print("Desired video mode fail, trying fallbacks...\n"); - success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, 60); + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, 60, vid_stereobuffer.integer); + if (!success && vid_stereobuffer.integer) + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, false); if (!success && vid_bitsperpixel.integer > 16) - success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, 16, 60); + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, 16, 60, false); if (!success && (vid_width.integer > 640 || vid_height.integer > 480)) - success = VID_Mode(vid_fullscreen.integer, 640, 480, 16, 60); + success = VID_Mode(vid_fullscreen.integer, 640, 480, 16, 60, false); if (!success && vid_fullscreen.integer) - success = VID_Mode(false, 640, 480, 16, 60); + success = VID_Mode(false, 640, 480, 16, 60, false); if (!success) Sys_Error("Video modes failed"); }