X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=76d3c75b2889ac147f080f91d4183ec075145570;hb=fcadc1494fa4ecbeb51d1ed61d68d84d1360c0f1;hp=f711424d694479de713b7100e72dd31a0da5b8df;hpb=8245fb13a546415cd156f33d4f5ca7d90b2863f8;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index f711424d..76d3c75b 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -24,12 +24,30 @@ int gl_texture3d = false; int gl_texturecubemap = false; // GL_ARB_texture_env_dot3 int gl_dot3arb = false; +// GL_SGIS_texture_edge_clamp +int gl_support_clamptoedge = false; +// GL_NV_vertex_array_range +int gl_support_var = false; +// GL_NV_vertex_array_range2 +int gl_support_var2 = false; +// GL_EXT_texture_filter_anisotropic +int gl_support_anisotropy = false; // LordHavoc: if window is hidden, don't update screen int vid_hidden = true; // LordHavoc: if window is not the active window, don't hog as much CPU time, // let go of the mouse, turn off sound, and restore system gamma ramps... int vid_activewindow = true; +// LordHavoc: whether to allow use of hwgamma (disabled when window is inactive) +int vid_allowhwgamma = false; + +// we don't know until we try it! +int vid_hardwaregammasupported = true; +// whether hardware gamma ramps are currently in effect +int 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"}; @@ -40,11 +58,27 @@ cvar_t vid_stencil = {CVAR_SAVE, "vid_stencil", "0"}; cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; cvar_t gl_combine = {0, "gl_combine", "1"}; -cvar_t in_pitch_min = {0, "in_pitch_min", "-90"}; -cvar_t in_pitch_max = {0, "in_pitch_max", "90"}; +cvar_t in_pitch_min = {0, "in_pitch_min", "-70"}; +cvar_t in_pitch_max = {0, "in_pitch_max", "80"}; cvar_t m_filter = {CVAR_SAVE, "m_filter","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_overbrightbits = {CVAR_SAVE, "v_overbrightbits", "0"}; +cvar_t v_hwgamma = {0, "v_hwgamma", "1"}; + // brand of graphics chip const char *gl_vendor; // graphics chip model and other information @@ -62,7 +96,8 @@ const char *gl_platformextensions; char gl_driver[256]; // GL_ARB_multitexture -//void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat); +void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat); +void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat); void (GLAPIENTRY *qglActiveTexture) (GLenum); void (GLAPIENTRY *qglClientActiveTexture) (GLenum); @@ -70,6 +105,11 @@ 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 @@ -85,7 +125,7 @@ void (GLAPIENTRY *qglCullFace)(GLenum mode); //void (GLAPIENTRY *qglReadBuffer)(GLenum mode); void (GLAPIENTRY *qglEnable)(GLenum cap); void (GLAPIENTRY *qglDisable)(GLenum cap); -//GLboolean GLAPIENTRY *qglIsEnabled)(GLenum cap); +GLboolean (GLAPIENTRY *qglIsEnabled)(GLenum cap); void (GLAPIENTRY *qglEnableClientState)(GLenum cap); void (GLAPIENTRY *qglDisableClientState)(GLenum cap); @@ -103,23 +143,25 @@ void (GLAPIENTRY *qglFlush)(void); void (GLAPIENTRY *qglClearDepth)(GLclampd depth); void (GLAPIENTRY *qglDepthFunc)(GLenum func); void (GLAPIENTRY *qglDepthMask)(GLboolean flag); -//void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val); +void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val); void (GLAPIENTRY *qglColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); void (GLAPIENTRY *qglDrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); void (GLAPIENTRY *qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices); void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); -//void (GLAPIENTRY *qglNormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr); +void (GLAPIENTRY *qglNormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr); void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); -//void (GLAPIENTRY *qglArrayElement)(GLint i); +void (GLAPIENTRY *qglArrayElement)(GLint i); void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -//void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t); -//void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y); -//void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z); -//void (GLAPIENTRY *qglBegin)(GLenum mode); -//void (GLAPIENTRY *qglEnd)(void); +void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t); +void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t); +void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r); +void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y); +void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z); +void (GLAPIENTRY *qglBegin)(GLenum mode); +void (GLAPIENTRY *qglEnd)(void); void (GLAPIENTRY *qglMatrixMode)(GLenum mode); void (GLAPIENTRY *qglOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); @@ -127,7 +169,7 @@ void (GLAPIENTRY *qglFrustum)(GLdouble left, GLdouble right, GLdouble bottom, GL void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); //void (GLAPIENTRY *qglPushMatrix)(void); //void (GLAPIENTRY *qglPopMatrix)(void); -//void (GLAPIENTRY *qglLoadIdentity)(void); +void (GLAPIENTRY *qglLoadIdentity)(void); //void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m); void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m); //void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m); @@ -148,7 +190,7 @@ void (GLAPIENTRY *qglClearStencil)(GLint s); //void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param); void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param); -//void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); //void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params); void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param); @@ -188,14 +230,14 @@ int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char * 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)) { - Con_Printf("disabled by commandline\n"); + Con_DPrintf("disabled by commandline\n"); return false; } @@ -207,19 +249,19 @@ int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char * if (!(*func->funcvariable = (void *) GL_GetProcAddress(func->name))) { if (!silent) - Con_Printf("missing function \"%s\" - broken driver!\n", func->name); + Con_Printf("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_Printf("enabled\n"); + Con_DPrintf("enabled\n"); return true; } else { - Con_Printf("not detected\n"); + Con_DPrintf("not detected\n"); return false; } } @@ -235,7 +277,7 @@ static dllfunction_t opengl110funcs[] = // {"glReadBuffer", (void **) &qglReadBuffer}, {"glEnable", (void **) &qglEnable}, {"glDisable", (void **) &qglDisable}, -// {"glIsEnabled", (void **) &qglIsEnabled}, + {"glIsEnabled", (void **) &qglIsEnabled}, {"glEnableClientState", (void **) &qglEnableClientState}, {"glDisableClientState", (void **) &qglDisableClientState}, // {"glGetBooleanv", (void **) &qglGetBooleanv}, @@ -249,27 +291,28 @@ static dllfunction_t opengl110funcs[] = {"glClearDepth", (void **) &qglClearDepth}, {"glDepthFunc", (void **) &qglDepthFunc}, {"glDepthMask", (void **) &qglDepthMask}, -// {"glDepthRange", (void **) &qglDepthRange}, + {"glDepthRange", (void **) &qglDepthRange}, {"glDrawElements", (void **) &qglDrawElements}, {"glColorMask", (void **) &qglColorMask}, {"glVertexPointer", (void **) &qglVertexPointer}, -// {"glNormalPointer", (void **) &qglNormalPointer}, + {"glNormalPointer", (void **) &qglNormalPointer}, {"glColorPointer", (void **) &qglColorPointer}, {"glTexCoordPointer", (void **) &qglTexCoordPointer}, -// {"glArrayElement", (void **) &qglArrayElement}, + {"glArrayElement", (void **) &qglArrayElement}, {"glColor4f", (void **) &qglColor4f}, -// {"glTexCoord2f", (void **) &qglTexCoord2f}, -// {"glVertex2f", (void **) &qglVertex2f}, -// {"glVertex3f", (void **) &qglVertex3f}, -// {"glBegin", (void **) &qglBegin}, -// {"glEnd", (void **) &qglEnd}, + {"glTexCoord2f", (void **) &qglTexCoord2f}, + {"glTexCoord3f", (void **) &qglTexCoord3f}, + {"glVertex2f", (void **) &qglVertex2f}, + {"glVertex3f", (void **) &qglVertex3f}, + {"glBegin", (void **) &qglBegin}, + {"glEnd", (void **) &qglEnd}, {"glMatrixMode", (void **) &qglMatrixMode}, {"glOrtho", (void **) &qglOrtho}, {"glFrustum", (void **) &qglFrustum}, {"glViewport", (void **) &qglViewport}, // {"glPushMatrix", (void **) &qglPushMatrix}, // {"glPopMatrix", (void **) &qglPopMatrix}, -// {"glLoadIdentity", (void **) &qglLoadIdentity}, + {"glLoadIdentity", (void **) &qglLoadIdentity}, // {"glLoadMatrixd", (void **) &qglLoadMatrixd}, {"glLoadMatrixf", (void **) &qglLoadMatrixf}, // {"glMultMatrixd", (void **) &qglMultMatrixd}, @@ -287,7 +330,7 @@ static dllfunction_t opengl110funcs[] = {"glClearStencil", (void **) &qglClearStencil}, // {"glTexEnvf", (void **) &qglTexEnvf}, {"glTexEnvi", (void **) &qglTexEnvi}, -// {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameterf", (void **) &qglTexParameterf}, // {"glTexParameterfv", (void **) &qglTexParameterfv}, {"glTexParameteri", (void **) &qglTexParameteri}, // {"glPixelStoref", (void **) &qglPixelStoref}, @@ -325,7 +368,8 @@ static dllfunction_t drawrangeelementsextfuncs[] = static dllfunction_t multitexturefuncs[] = { - //{"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, + {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, + {"glMultiTexCoord3fARB", (void **) &qglMultiTexCoord3f}, {"glActiveTextureARB", (void **) &qglActiveTexture}, {"glClientActiveTextureARB", (void **) &qglClientActiveTexture}, {NULL, NULL} @@ -346,6 +390,25 @@ static dllfunction_t texture3dextfuncs[] = {NULL, NULL} }; +static dllfunction_t glxvarfuncs[] = +{ + {"glXAllocateMemoryNV", (void **) &qglAllocateMemoryNV}, + {"glXFreeMemoryNV", (void **) &qglFreeMemoryNV}, + {"glVertexArrayRangeNV", (void **) &qglVertexArrayRangeNV}, + {"glFlushVertexArrayRangeNV", (void **) &qglFlushVertexArrayRangeNV}, + {NULL, NULL} +}; + +static dllfunction_t wglvarfuncs[] = +{ + {"wglAllocateMemoryNV", (void **) &qglAllocateMemoryNV}, + {"wglFreeMemoryNV", (void **) &qglFreeMemoryNV}, + {"glVertexArrayRangeNV", (void **) &qglVertexArrayRangeNV}, + {"glFlushVertexArrayRangeNV", (void **) &qglFlushVertexArrayRangeNV}, + {NULL, NULL} +}; + + void VID_CheckExtensions(void) { gl_stencil = vid_stencil.integer; @@ -353,17 +416,20 @@ void VID_CheckExtensions(void) gl_dot3arb = false; gl_supportslockarrays = false; gl_textureunits = 1; + gl_support_clamptoedge = false; + gl_support_var = false; + gl_support_var2 = false; if (!GL_CheckExtension("OpenGL 1.1.0", opengl110funcs, NULL, false)) Sys_Error("OpenGL 1.1.0 functions not found\n"); - 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); + Con_DPrintf ("GL_VENDOR: %s\n", gl_vendor); + Con_DPrintf ("GL_RENDERER: %s\n", gl_renderer); + Con_DPrintf ("GL_VERSION: %s\n", gl_version); + Con_DPrintf ("GL_EXTENSIONS: %s\n", gl_extensions); + Con_DPrintf ("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions); - Con_Printf("Checking OpenGL extensions...\n"); + Con_DPrintf("Checking OpenGL extensions...\n"); if (!GL_CheckExtension("glDrawRangeElements", drawrangeelementsfuncs, "-nodrawrangeelements", true)) GL_CheckExtension("GL_EXT_draw_range_elements", drawrangeelementsextfuncs, "-nodrawrangeelements", false); @@ -379,12 +445,54 @@ void VID_CheckExtensions(void) gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false); gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false); gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false); + gl_support_clamptoedge = GL_CheckExtension("GL_EXT_texture_edge_clamp", NULL, "-noedgeclamp", false) || GL_CheckExtension("GL_SGIS_texture_edge_clamp", NULL, "-noedgeclamp", false); + + if (!strcmp(gl_platform, "GLX")) + gl_support_var = GL_CheckExtension("GL_NV_vertex_array_range", glxvarfuncs, "-novar", false); + else if (!strcmp(gl_platform, "WGL")) + gl_support_var = GL_CheckExtension("GL_NV_vertex_array_range", wglvarfuncs, "-novar", false); + if (gl_support_var) + gl_support_var2 = GL_CheckExtension("GL_NV_vertex_array_range2", NULL, "-novar2", false); + + gl_support_anisotropy = GL_CheckExtension("GL_EXT_texture_filter_anisotropic", NULL, "-noanisotropy", false); // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code if (qglDrawRangeElements == NULL) qglDrawRangeElements = qglDrawRangeElementsEXT; } +int 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; +} + void Force_CenterView_f (void) { cl.viewangles[PITCH] = 0; @@ -445,8 +553,114 @@ void IN_Mouse(usercmd_t *cmd, float mx, float my) } } +static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3]; +static int cacheoverbrightbits = -1, 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) +{ + cvar_t *c; + float f; + + // LordHavoc: don't mess with gamma tables if running dedicated + if (cls.state == ca_dedicated) + return; + + if (!force + && vid_usinghwgamma == (vid_allowhwgamma && v_hwgamma.integer) + && v_overbrightbits.integer == cacheoverbrightbits + && v_gamma.value == cachegamma + && v_contrast.value == cachecontrast + && v_brightness.value == cachebrightness + && cachecolorenable == v_color_enable.integer + && cacheblack[0] == v_color_black_r.value + && cacheblack[1] == v_color_black_g.value + && cacheblack[2] == v_color_black_b.value + && cachegrey[0] == v_color_grey_r.value + && cachegrey[1] == v_color_grey_g.value + && cachegrey[2] == v_color_grey_b.value + && cachewhite[0] == v_color_white_r.value + && cachewhite[1] == v_color_white_g.value + && cachewhite[2] == v_color_white_b.value) + return; + + if (vid_allowhwgamma && v_hwgamma.integer) + { + if (!vid_usinghwgamma) + { + vid_usinghwgamma = true; + vid_hardwaregammasupported = VID_GetGamma(vid_systemgammaramps); + } + + 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; + cacheoverbrightbits = v_overbrightbits.integer; + cachehwgamma = v_hwgamma.integer; + + if (cachecolorenable) + { + BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps); + BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + 256); + BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + 512); + } + else + { + BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps); + BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 256); + BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512); + } + + vid_hardwaregammasupported = VID_SetGamma(vid_gammaramps); + } + else + { + if (vid_usinghwgamma) + { + vid_usinghwgamma = false; + vid_hardwaregammasupported = VID_SetGamma(vid_systemgammaramps); + } + } +} + +void VID_RestoreSystemGamma(void) +{ + if (vid_usinghwgamma) + { + vid_usinghwgamma = false; + VID_SetGamma(vid_systemgammaramps); + } +} + void VID_Shared_Init(void) { + Cvar_RegisterVariable(&v_gamma); + Cvar_RegisterVariable(&v_brightness); + Cvar_RegisterVariable(&v_contrast); + + Cvar_RegisterVariable(&v_color_enable); + Cvar_RegisterVariable(&v_color_black_r); + Cvar_RegisterVariable(&v_color_black_g); + Cvar_RegisterVariable(&v_color_black_b); + Cvar_RegisterVariable(&v_color_grey_r); + Cvar_RegisterVariable(&v_color_grey_g); + Cvar_RegisterVariable(&v_color_grey_b); + Cvar_RegisterVariable(&v_color_white_r); + Cvar_RegisterVariable(&v_color_white_g); + Cvar_RegisterVariable(&v_color_white_b); + + Cvar_RegisterVariable(&v_hwgamma); + Cvar_RegisterVariable(&v_overbrightbits); + Cvar_RegisterVariable(&vid_fullscreen); Cvar_RegisterVariable(&vid_width); Cvar_RegisterVariable(&vid_height); @@ -459,6 +673,8 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&m_filter); Cmd_AddCommand("force_centerview", Force_CenterView_f); Cmd_AddCommand("vid_restart", VID_Restart_f); + if (gamemode == GAME_GOODVSBAD2) + Cvar_Set("gl_combine", "0"); } int current_vid_fullscreen; @@ -557,7 +773,7 @@ void VID_Open(void) Cvar_SetValueQuick(&vid_stencil, 0); } - Con_Printf("Starting video system\n"); + Con_DPrintf("Starting video system\n"); if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer)) { Con_Printf("Desired video mode fail, trying fallbacks...\n"); @@ -581,3 +797,4 @@ void VID_Close(void) VID_CloseSystems(); VID_Shutdown(); } +