X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_shared.c;h=40730d2ac65d43a89eb08651d6d25dc6e591c7a3;hp=f9621dc3f3c8f98c7cb09745350d3a5531488df3;hb=b7bec17fc069aac4bb8bc7739bb2ea3cb98e4f4b;hpb=fab6eb344365652bd53d03faa1ea43e14fbe1d7f diff --git a/vid_shared.c b/vid_shared.c index f9621dc3..40730d2a 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -15,6 +15,10 @@ qboolean in_client_mouse = true; // AK where should it be placed ? float in_mouse_x, in_mouse_y; +// value of GL_MAX_TEXTURE__SIZE +int gl_max_texture_size = 0; +int gl_max_3d_texture_size = 0; +int gl_max_cube_map_texture_size = 0; // GL_ARB_multitexture int gl_textureunits = 1; // GL_ARB_texture_env_combine or GL_EXT_texture_env_combine @@ -29,6 +33,8 @@ int gl_stencil = false; int gl_texture3d = false; // GL_ARB_texture_cubemap int gl_texturecubemap = false; +// GL_ARB_texture_non_power_of_two +int gl_support_arb_texture_non_power_of_two = false; // GL_ARB_texture_env_dot3 int gl_dot3arb = false; // GL_SGIS_texture_edge_clamp @@ -36,10 +42,14 @@ int gl_support_clamptoedge = false; // GL_EXT_texture_filter_anisotropic int gl_support_anisotropy = false; int gl_max_anisotropy = 1; -// GL_NV_texture_shader -int gl_textureshader = false; +// OpenGL2.0 core glStencilOpSeparate, or GL_ATI_separate_stencil +int gl_support_separatestencil = false; // GL_EXT_stencil_two_side int gl_support_stenciltwoside = false; +// GL_EXT_blend_minmax +int gl_support_ext_blend_minmax = false; +// GL_EXT_blend_subtract +int gl_support_ext_blend_subtract = false; // GL_ARB_shader_objects int gl_support_shader_objects = false; // GL_ARB_shading_language_100 @@ -48,8 +58,6 @@ int gl_support_shading_language_100 = false; int gl_support_vertex_shader = false; // GL_ARB_fragment_shader int gl_support_fragment_shader = false; -// GL_NV_half_float -int gl_support_half_float = false; // LordHavoc: if window is hidden, don't update screen qboolean vid_hidden = true; @@ -58,38 +66,43 @@ qboolean vid_hidden = true; qboolean vid_activewindow = true; // we don't know until we try it! -cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1"}; +cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1", "indicates whether hardware gamma is supported (updated by attempts to set hardware gamma ramps)"}; // whether hardware gamma ramps are currently in effect qboolean vid_usinghwgamma = false; -unsigned short vid_gammaramps[768]; -unsigned short vid_systemgammaramps[768]; - -cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1"}; -cvar_t vid_width = {CVAR_SAVE, "vid_width", "640"}; -cvar_t vid_height = {CVAR_SAVE, "vid_height", "480"}; -cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"}; - -cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0"}; -cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; -cvar_t gl_combine = {0, "gl_combine", "1"}; -cvar_t gl_finish = {0, "gl_finish", "0"}; - -cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1"}; -cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1"}; -cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0"}; -cvar_t v_color_enable = {CVAR_SAVE, "v_color_enable", "0"}; -cvar_t v_color_black_r = {CVAR_SAVE, "v_color_black_r", "0"}; -cvar_t v_color_black_g = {CVAR_SAVE, "v_color_black_g", "0"}; -cvar_t v_color_black_b = {CVAR_SAVE, "v_color_black_b", "0"}; -cvar_t v_color_grey_r = {CVAR_SAVE, "v_color_grey_r", "0.5"}; -cvar_t v_color_grey_g = {CVAR_SAVE, "v_color_grey_g", "0.5"}; -cvar_t v_color_grey_b = {CVAR_SAVE, "v_color_grey_b", "0.5"}; -cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1"}; -cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1"}; -cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1"}; -cvar_t v_hwgamma = {CVAR_SAVE, "v_hwgamma", "1"}; -cvar_t v_psycho = {0, "v_psycho", "0"}; +int vid_gammarampsize = 0; +unsigned short *vid_gammaramps = NULL; +unsigned short *vid_systemgammaramps = NULL; + +cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1", "use fullscreen (1) or windowed (0)"}; +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 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)"}; +cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0", "brightness of black, useful for monitors that are too dark"}; +cvar_t v_color_enable = {CVAR_SAVE, "v_color_enable", "0", "enables black-grey-white color correction curve controls"}; +cvar_t v_color_black_r = {CVAR_SAVE, "v_color_black_r", "0", "desired color of black"}; +cvar_t v_color_black_g = {CVAR_SAVE, "v_color_black_g", "0", "desired color of black"}; +cvar_t v_color_black_b = {CVAR_SAVE, "v_color_black_b", "0", "desired color of black"}; +cvar_t v_color_grey_r = {CVAR_SAVE, "v_color_grey_r", "0.5", "desired color of grey"}; +cvar_t v_color_grey_g = {CVAR_SAVE, "v_color_grey_g", "0.5", "desired color of grey"}; +cvar_t v_color_grey_b = {CVAR_SAVE, "v_color_grey_b", "0.5", "desired color of grey"}; +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), 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 const char *gl_vendor; @@ -119,12 +132,6 @@ void (GLAPIENTRY *qglClientActiveTexture) (GLenum); void (GLAPIENTRY *qglLockArraysEXT) (GLint first, GLint count); void (GLAPIENTRY *qglUnlockArraysEXT) (void); -//GL_NV_vertex_array_range -GLvoid *(GLAPIENTRY *qglAllocateMemoryNV)(GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority); -GLvoid (GLAPIENTRY *qglFreeMemoryNV)(GLvoid *pointer); -GLvoid (GLAPIENTRY *qglVertexArrayRangeNV)(GLsizei length, GLvoid *pointer); -GLvoid (GLAPIENTRY *qglFlushVertexArrayRangeNV)(GLvoid); - // general GL functions void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); @@ -240,7 +247,17 @@ void (GLAPIENTRY *qglCopyTexSubImage3D)(GLenum target, GLint level, GLint xoffse void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height); void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units); +void (GLAPIENTRY *qglPolygonMode)(GLenum face, GLenum mode); +void (GLAPIENTRY *qglPolygonStipple)(const GLubyte *mask); + +//[515]: added on 29.07.2005 +void (GLAPIENTRY *qglLineWidth)(GLfloat width); +void (GLAPIENTRY *qglPointSize)(GLfloat size); + +void (GLAPIENTRY *qglBlendEquationEXT)(GLenum); +void (GLAPIENTRY *qglStencilOpSeparate)(GLenum, GLenum, GLenum, GLenum); +void (GLAPIENTRY *qglStencilFuncSeparate)(GLenum, GLenum, GLint, GLuint); void (GLAPIENTRY *qglActiveStencilFaceEXT)(GLenum); void (GLAPIENTRY *qglDeleteObjectARB)(GLhandleARB obj); @@ -413,6 +430,10 @@ static dllfunction_t opengl110funcs[] = {"glVertex3f", (void **) &qglVertex3f}, {"glBegin", (void **) &qglBegin}, {"glEnd", (void **) &qglEnd}, +//[515]: added on 29.07.2005 + {"glLineWidth", (void**) &qglLineWidth}, + {"glPointSize", (void**) &qglPointSize}, +// {"glMatrixMode", (void **) &qglMatrixMode}, {"glOrtho", (void **) &qglOrtho}, {"glFrustum", (void **) &qglFrustum}, @@ -459,6 +480,8 @@ static dllfunction_t opengl110funcs[] = {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D}, {"glScissor", (void **) &qglScissor}, {"glPolygonOffset", (void **) &qglPolygonOffset}, + {"glPolygonMode", (void **) &qglPolygonMode}, + {"glPolygonStipple", (void **) &qglPolygonStipple}, {NULL, NULL} }; @@ -500,12 +523,32 @@ static dllfunction_t texture3dextfuncs[] = {NULL, NULL} }; +static dllfunction_t atiseparatestencilfuncs[] = +{ + {"glStencilOpSeparateATI", (void **) &qglStencilOpSeparate}, + {"glStencilFuncSeparateATI", (void **) &qglStencilFuncSeparate}, + {NULL, NULL} +}; + +static dllfunction_t gl2separatestencilfuncs[] = +{ + {"glStencilOpSeparate", (void **) &qglStencilOpSeparate}, + {"glStencilFuncSeparate", (void **) &qglStencilFuncSeparate}, + {NULL, NULL} +}; + static dllfunction_t stenciltwosidefuncs[] = { {"glActiveStencilFaceEXT", (void **) &qglActiveStencilFaceEXT}, {NULL, NULL} }; +static dllfunction_t blendequationfuncs[] = +{ + {"glBlendEquationEXT", (void **) &qglBlendEquationEXT}, + {NULL, NULL} +}; + static dllfunction_t shaderobjectsfuncs[] = { {"glDeleteObjectARB", (void **) &qglDeleteObjectARB}, @@ -608,17 +651,23 @@ void VID_CheckExtensions(void) // reset all the gl extension variables here // this should match the declarations + gl_max_texture_size = 0; + gl_max_3d_texture_size = 0; + gl_max_cube_map_texture_size = 0; gl_textureunits = 1; gl_combine_extension = false; gl_supportslockarrays = false; gl_texture3d = false; gl_texturecubemap = false; + gl_support_arb_texture_non_power_of_two = false; gl_dot3arb = false; gl_support_clamptoedge = false; gl_support_anisotropy = false; gl_max_anisotropy = 1; - gl_textureshader = false; + gl_support_separatestencil = false; gl_support_stenciltwoside = false; + gl_support_ext_blend_minmax = false; + gl_support_ext_blend_subtract = false; gl_support_shader_objects = false; gl_support_shading_language_100 = false; gl_support_vertex_shader = false; @@ -633,6 +682,9 @@ 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"); // COMMANDLINEOPTION: GL: -nodrawrangeelements disables GL_EXT_draw_range_elements (renders faster) @@ -651,9 +703,19 @@ void VID_CheckExtensions(void) } // COMMANDLINEOPTION: GL: -notexture3d disables GL_EXT_texture3D (required for spherical lights, otherwise they render as a column) - gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false); + 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) - gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false); + 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); + gl_support_arb_texture_non_power_of_two = GL_CheckExtension("GL_ARB_texture_non_power_of_two", NULL, "-notexturenonpoweroftwo", false); // COMMANDLINEOPTION: GL: -nocva disables GL_EXT_compiled_vertex_array (renders faster) gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false); // COMMANDLINEOPTION: GL: -noedgeclamp disables GL_EXT_texture_edge_clamp or GL_SGIS_texture_edge_clamp (recommended, some cards do not support the other texture clamp method) @@ -663,9 +725,12 @@ void VID_CheckExtensions(void) if ((gl_support_anisotropy = GL_CheckExtension("GL_EXT_texture_filter_anisotropic", NULL, "-noanisotropy", false))) qglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &gl_max_anisotropy); -// COMMANDLINEOPTION: GL: -notextureshader disables GL_NV_texture_shader (required for the Geforce3 water shader, NVIDIA only) - gl_textureshader = GL_CheckExtension("GL_NV_texture_shader", NULL, "-notextureshader", false); + gl_support_ext_blend_minmax = GL_CheckExtension("GL_EXT_blend_minmax", blendequationfuncs, "-noblendminmax", false); + gl_support_ext_blend_subtract = GL_CheckExtension("GL_EXT_blend_subtract", blendequationfuncs, "-noblendsubtract", false); +// COMMANDLINEOPTION: GL: -noseparatestencil disables use of OpenGL2.0 glStencilOpSeparate and GL_ATI_separate_stencil extensions (accelerates shadow rendering) + if (!(gl_support_separatestencil = GL_CheckExtension("glStencilOpSeparate", gl2separatestencilfuncs, "-noseparatestencil", false))) + gl_support_separatestencil = GL_CheckExtension("GL_ATI_separate_stencil", atiseparatestencilfuncs, "-noseparatestencil", false); // COMMANDLINEOPTION: GL: -nostenciltwoside disables GL_EXT_stencil_two_side (accelerates shadow rendering) gl_support_stenciltwoside = GL_CheckExtension("GL_EXT_stencil_two_side", stenciltwosidefuncs, "-nostenciltwoside", false); @@ -681,41 +746,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); - -// COMMANDLINEOPTION: GL: -nohalffloat disables GL_NV_half_float extension - gl_support_half_float = GL_CheckExtension("GL_NV_half_float", NULL, "-nohalffloat", false); -} - -qboolean vid_vertexarrays_are_var = false; -void *VID_AllocVertexArrays(mempool_t *pool, int size, int fast, float readfrequency, float writefrequency, float priority) -{ - void *m; - vid_vertexarrays_are_var = false; - if (fast && qglAllocateMemoryNV) - { - CHECKGLERROR - m = qglAllocateMemoryNV(size, readfrequency, writefrequency, priority); - CHECKGLERROR - if (m) - { - vid_vertexarrays_are_var = true; - return m; - } - } - return Mem_Alloc(pool, size); -} - -void VID_FreeVertexArrays(void *pointer) -{ - if (vid_vertexarrays_are_var) - { - CHECKGLERROR - qglFreeMemoryNV(pointer); - CHECKGLERROR - } - else - Mem_Free(pointer); - vid_vertexarrays_are_var = false; + CHECKGLERROR } void Force_CenterView_f (void) @@ -723,23 +754,23 @@ 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); -void VID_UpdateGamma(qboolean force) +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 @@ -755,42 +786,50 @@ void VID_UpdateGamma(qboolean force) && 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) { vid_usinghwgamma = true; - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_GetGamma(vid_systemgammaramps)); + if (vid_gammarampsize != rampsize || !vid_gammaramps) + { + vid_gammarampsize = rampsize; + if (vid_gammaramps) + Z_Free(vid_gammaramps); + vid_gammaramps = (unsigned short *)Z_Malloc(6 * vid_gammarampsize * sizeof(unsigned short)); + vid_systemgammaramps = vid_gammaramps + 3 * vid_gammarampsize; + } + 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); - BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + 256); - BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + 512); + BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize); + BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + vid_gammarampsize, rampsize); + BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + vid_gammarampsize*2, rampsize); } else { - BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps); - BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 256); - BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512); + BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps, rampsize); + BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize, rampsize); + BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize*2, rampsize); } // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have @@ -803,7 +842,7 @@ void VID_UpdateGamma(qboolean force) static float n[3], nd[3], nt[3]; static int init = true; unsigned short *ramp; - forcenextframe = true; + gamma_forcenextframe = true; if (init) { init = false; @@ -817,32 +856,39 @@ void VID_UpdateGamma(qboolean force) 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 < 256;y++, t += 0.75f * (2.0f / 256.0f)) - *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f; + 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); } - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps)); + // 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_SetGamma(vid_systemgammaramps); + { + if (vid_usinghwgamma) + { + vid_usinghwgamma = false; + VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); + } + } } else { if (vid_usinghwgamma) { vid_usinghwgamma = false; - Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps)); + VID_SetGamma(vid_systemgammaramps, vid_gammarampsize); } } } @@ -852,7 +898,9 @@ void VID_RestoreSystemGamma(void) if (vid_usinghwgamma) { vid_usinghwgamma = false; - VID_SetGamma(vid_systemgammaramps); + Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps, vid_gammarampsize)); + // force gamma situation to be reexamined next frame + gamma_forcenextframe = true; } } @@ -882,29 +930,37 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&vid_width); 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); + Cvar_RegisterVariable(&vid_minheight); Cvar_RegisterVariable(&gl_combine); Cvar_RegisterVariable(&gl_finish); - Cmd_AddCommand("force_centerview", Force_CenterView_f); - Cmd_AddCommand("vid_restart", VID_Restart_f); + Cmd_AddCommand("force_centerview", Force_CenterView_f, "recenters view (stops looking up/down)"); + Cmd_AddCommand("vid_restart", VID_Restart_f, "restarts video system (closes and reopens the window, restarts renderer)"); if (gamemode == GAME_GOODVSBAD2) Cvar_Set("gl_combine", "0"); } -int VID_Mode(int fullscreen, int width, int height, int bpp) +int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { - Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp); - if (VID_InitMode(fullscreen, width, height, bpp)) + 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 @@ -936,10 +992,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)) + 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)) + 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(); @@ -981,16 +1037,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); + 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, 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); + 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); + success = VID_Mode(vid_fullscreen.integer, 640, 480, 16, 60, false); if (!success && vid_fullscreen.integer) - success = VID_Mode(false, 640, 480, 16); + success = VID_Mode(false, 640, 480, 16, 60, false); if (!success) Sys_Error("Video modes failed"); }