X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=6c844d924aff1eb2f38a2ff954f60577066fb539;hb=c4ddb9412fdc65efb2e47807baedf7a25234f891;hp=2b1b370cdd695d52a8699165d1244d5cc2bb6b0d;hpb=bdffd88cf8584630d1e24363e75a969435af2809;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 2b1b370c..6c844d92 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -24,27 +24,61 @@ 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; +// GL_NV_texture_shader +int gl_textureshader = 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"}; cvar_t vid_height = {CVAR_SAVE, "vid_height", "480"}; -cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "16"}; -cvar_t vid_stencil = {CVAR_SAVE, "vid_stencil", "0"}; +cvar_t vid_bitsperpixel = {CVAR_SAVE, "vid_bitsperpixel", "32"}; cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; -cvar_t gl_combine = {0, "gl_combine", "1"}; +cvar_t gl_combine = {CVAR_SAVE, "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_hwgamma = {CVAR_SAVE, "v_hwgamma", "1"}; + // brand of graphics chip const char *gl_vendor; // graphics chip model and other information @@ -63,6 +97,7 @@ char gl_driver[256]; // GL_ARB_multitexture 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 @@ -81,18 +121,18 @@ void (GLAPIENTRY *qglClear)(GLbitfield mask); void (GLAPIENTRY *qglBlendFunc)(GLenum sfactor, GLenum dfactor); void (GLAPIENTRY *qglCullFace)(GLenum mode); -void (GLAPIENTRY *qglDrawBuffer)(GLenum mode); -void (GLAPIENTRY *qglReadBuffer)(GLenum mode); +//void (GLAPIENTRY *qglDrawBuffer)(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); -void (GLAPIENTRY *qglGetBooleanv)(GLenum pname, GLboolean *params); -void (GLAPIENTRY *qglGetDoublev)(GLenum pname, GLdouble *params); -void (GLAPIENTRY *qglGetFloatv)(GLenum pname, GLfloat *params); +//void (GLAPIENTRY *qglGetBooleanv)(GLenum pname, GLboolean *params); +//void (GLAPIENTRY *qglGetDoublev)(GLenum pname, GLdouble *params); +//void (GLAPIENTRY *qglGetFloatv)(GLenum pname, GLfloat *params); void (GLAPIENTRY *qglGetIntegerv)(GLenum pname, GLint *params); GLenum (GLAPIENTRY *qglGetError)(void); @@ -109,13 +149,15 @@ void (GLAPIENTRY *qglColorMask)(GLboolean red, GLboolean green, GLboolean blue, 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 *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); 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); @@ -128,16 +170,16 @@ 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 *qglLoadMatrixd)(const GLdouble *m); +//void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m); void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m); //void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m); //void (GLAPIENTRY *qglMultMatrixf)(const GLfloat *m); //void (GLAPIENTRY *qglRotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -void (GLAPIENTRY *qglRotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); +//void (GLAPIENTRY *qglRotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); //void (GLAPIENTRY *qglScaled)(GLdouble x, GLdouble y, GLdouble z); //void (GLAPIENTRY *qglScalef)(GLfloat x, GLfloat y, GLfloat z); //void (GLAPIENTRY *qglTranslated)(GLdouble x, GLdouble y, GLdouble z); -void (GLAPIENTRY *qglTranslatef)(GLfloat x, GLfloat y, GLfloat z); +//void (GLAPIENTRY *qglTranslatef)(GLfloat x, GLfloat y, GLfloat z); void (GLAPIENTRY *qglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); @@ -146,19 +188,20 @@ void (GLAPIENTRY *qglStencilMask)(GLuint mask); void (GLAPIENTRY *qglStencilOp)(GLenum fail, GLenum zfail, GLenum zpass); void (GLAPIENTRY *qglClearStencil)(GLint s); -void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param); +//void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexEnvfv)(GLenum target, GLenum pname, const GLfloat *params); void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param); void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); -void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params); +//void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params); void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param); void (GLAPIENTRY *qglGenTextures)(GLsizei n, GLuint *textures); void (GLAPIENTRY *qglDeleteTextures)(GLsizei n, const GLuint *textures); void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture); -void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities); -GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences); +//void (GLAPIENTRY *qglPrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities); +//GLboolean (GLAPIENTRY *qglAreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences); GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture); -void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param); +//void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param); void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param); void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); @@ -188,14 +231,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 +250,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; } } @@ -231,16 +274,16 @@ static dllfunction_t opengl110funcs[] = // {"glAlphaFunc", (void **) &qglAlphaFunc}, {"glBlendFunc", (void **) &qglBlendFunc}, {"glCullFace", (void **) &qglCullFace}, - {"glDrawBuffer", (void **) &qglDrawBuffer}, - {"glReadBuffer", (void **) &qglReadBuffer}, +// {"glDrawBuffer", (void **) &qglDrawBuffer}, +// {"glReadBuffer", (void **) &qglReadBuffer}, {"glEnable", (void **) &qglEnable}, {"glDisable", (void **) &qglDisable}, -// {"glIsEnabled", (void **) &qglIsEnabled}, + {"glIsEnabled", (void **) &qglIsEnabled}, {"glEnableClientState", (void **) &qglEnableClientState}, {"glDisableClientState", (void **) &qglDisableClientState}, - {"glGetBooleanv", (void **) &qglGetBooleanv}, - {"glGetDoublev", (void **) &qglGetDoublev}, - {"glGetFloatv", (void **) &qglGetFloatv}, +// {"glGetBooleanv", (void **) &qglGetBooleanv}, +// {"glGetDoublev", (void **) &qglGetDoublev}, +// {"glGetFloatv", (void **) &qglGetFloatv}, {"glGetIntegerv", (void **) &qglGetIntegerv}, {"glGetError", (void **) &qglGetError}, {"glGetString", (void **) &qglGetString}, @@ -253,12 +296,13 @@ static dllfunction_t opengl110funcs[] = {"glDrawElements", (void **) &qglDrawElements}, {"glColorMask", (void **) &qglColorMask}, {"glVertexPointer", (void **) &qglVertexPointer}, -// {"glNormalPointer", (void **) &qglNormalPointer}, + {"glNormalPointer", (void **) &qglNormalPointer}, {"glColorPointer", (void **) &qglColorPointer}, {"glTexCoordPointer", (void **) &qglTexCoordPointer}, {"glArrayElement", (void **) &qglArrayElement}, {"glColor4f", (void **) &qglColor4f}, {"glTexCoord2f", (void **) &qglTexCoord2f}, + {"glTexCoord3f", (void **) &qglTexCoord3f}, {"glVertex2f", (void **) &qglVertex2f}, {"glVertex3f", (void **) &qglVertex3f}, {"glBegin", (void **) &qglBegin}, @@ -270,33 +314,34 @@ static dllfunction_t opengl110funcs[] = // {"glPushMatrix", (void **) &qglPushMatrix}, // {"glPopMatrix", (void **) &qglPopMatrix}, {"glLoadIdentity", (void **) &qglLoadIdentity}, - {"glLoadMatrixd", (void **) &qglLoadMatrixd}, +// {"glLoadMatrixd", (void **) &qglLoadMatrixd}, {"glLoadMatrixf", (void **) &qglLoadMatrixf}, // {"glMultMatrixd", (void **) &qglMultMatrixd}, // {"glMultMatrixf", (void **) &qglMultMatrixf}, // {"glRotated", (void **) &qglRotated}, - {"glRotatef", (void **) &qglRotatef}, +// {"glRotatef", (void **) &qglRotatef}, // {"glScaled", (void **) &qglScaled}, // {"glScalef", (void **) &qglScalef}, // {"glTranslated", (void **) &qglTranslated}, - {"glTranslatef", (void **) &qglTranslatef}, +// {"glTranslatef", (void **) &qglTranslatef}, {"glReadPixels", (void **) &qglReadPixels}, {"glStencilFunc", (void **) &qglStencilFunc}, {"glStencilMask", (void **) &qglStencilMask}, {"glStencilOp", (void **) &qglStencilOp}, {"glClearStencil", (void **) &qglClearStencil}, - {"glTexEnvf", (void **) &qglTexEnvf}, +// {"glTexEnvf", (void **) &qglTexEnvf}, + {"glTexEnvfv", (void **) &qglTexEnvfv}, {"glTexEnvi", (void **) &qglTexEnvi}, {"glTexParameterf", (void **) &qglTexParameterf}, - {"glTexParameterfv", (void **) &qglTexParameterfv}, +// {"glTexParameterfv", (void **) &qglTexParameterfv}, {"glTexParameteri", (void **) &qglTexParameteri}, - {"glPixelStoref", (void **) &qglPixelStoref}, +// {"glPixelStoref", (void **) &qglPixelStoref}, {"glPixelStorei", (void **) &qglPixelStorei}, {"glGenTextures", (void **) &qglGenTextures}, {"glDeleteTextures", (void **) &qglDeleteTextures}, {"glBindTexture", (void **) &qglBindTexture}, - {"glPrioritizeTextures", (void **) &qglPrioritizeTextures}, - {"glAreTexturesResident", (void **) &qglAreTexturesResident}, +// {"glPrioritizeTextures", (void **) &qglPrioritizeTextures}, +// {"glAreTexturesResident", (void **) &qglAreTexturesResident}, {"glIsTexture", (void **) &qglIsTexture}, {"glTexImage1D", (void **) &qglTexImage1D}, {"glTexImage2D", (void **) &qglTexImage2D}, @@ -326,6 +371,7 @@ static dllfunction_t drawrangeelementsextfuncs[] = static dllfunction_t multitexturefuncs[] = { {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, + {"glMultiTexCoord3fARB", (void **) &qglMultiTexCoord3f}, {"glActiveTextureARB", (void **) &qglActiveTexture}, {"glClientActiveTextureARB", (void **) &qglClientActiveTexture}, {NULL, NULL} @@ -346,24 +392,46 @@ 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; + gl_stencil = vid_bitsperpixel.integer == 32; gl_combine_extension = false; 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 +447,56 @@ 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); + + gl_textureshader = GL_CheckExtension("GL_NV_texture_shader", NULL, "-notextureshader", 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,13 +557,115 @@ void IN_Mouse(usercmd_t *cmd, float mx, float my) } } +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) +{ + 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_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; + 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); + } + 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); + } + + 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(&vid_fullscreen); Cvar_RegisterVariable(&vid_width); Cvar_RegisterVariable(&vid_height); Cvar_RegisterVariable(&vid_bitsperpixel); - Cvar_RegisterVariable(&vid_stencil); Cvar_RegisterVariable(&vid_mouse); Cvar_RegisterVariable(&gl_combine); Cvar_RegisterVariable(&in_pitch_min); @@ -459,29 +673,28 @@ 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; int current_vid_width; int current_vid_height; int current_vid_bitsperpixel; -int current_vid_stencil; -extern int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil); -int VID_Mode(int fullscreen, int width, int height, int bpp, int stencil) +extern int VID_InitMode (int fullscreen, int width, int height, int bpp); +int VID_Mode(int fullscreen, int width, int height, int bpp) { - Con_Printf("Video: %s %dx%dx%d %s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, stencil ? "with stencil" : "without stencil"); - if (VID_InitMode(fullscreen, width, height, bpp, stencil)) + Con_Printf("Video: %s %dx%dx%d\n", fullscreen ? "fullscreen" : "window", width, height, bpp); + if (VID_InitMode(fullscreen, width, height, bpp)) { current_vid_fullscreen = fullscreen; current_vid_width = width; current_vid_height = height; current_vid_bitsperpixel = bpp; - current_vid_stencil = stencil; Cvar_SetValueQuick(&vid_fullscreen, fullscreen); Cvar_SetValueQuick(&vid_width, width); Cvar_SetValueQuick(&vid_height, height); Cvar_SetValueQuick(&vid_bitsperpixel, bpp); - Cvar_SetValueQuick(&vid_stencil, stencil); return true; } else @@ -491,27 +704,27 @@ int VID_Mode(int fullscreen, int width, int height, int bpp, int stencil) static void VID_OpenSystems(void) { R_Modules_Start(); - S_Open(); - CDAudio_Open(); + S_Startup(); + CDAudio_Startup(); } static void VID_CloseSystems(void) { - CDAudio_Close(); - S_Close(); + CDAudio_Shutdown(); + S_Shutdown(); R_Modules_Shutdown(); } void VID_Restart_f(void) { - Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp %s, to %s %dx%dx%dbpp %s.\n", - current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel, current_vid_stencil ? "with stencil" : "without stencil", - vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer ? "with stencil" : "without stencil"); + Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp, to %s %dx%dx%dbpp.\n", + current_vid_fullscreen ? "fullscreen" : "window", current_vid_width, current_vid_height, current_vid_bitsperpixel, + vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer); VID_Close(); - if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer)) + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer)) { Con_Printf("Video mode change failed\n"); - if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel, current_vid_stencil)) + if (!VID_Mode(current_vid_fullscreen, current_vid_width, current_vid_height, current_vid_bitsperpixel)) Sys_Error("Unable to restore to last working video mode\n"); } VID_OpenSystems(); @@ -520,7 +733,7 @@ void VID_Restart_f(void) int vid_commandlinecheck = true; void VID_Open(void) { - int i; + int i, width, height; if (vid_commandlinecheck) { // interpret command-line parameters @@ -529,39 +742,36 @@ void VID_Open(void) Cvar_SetValueQuick(&vid_fullscreen, false); if ((i = COM_CheckParm("-fullscreen")) != 0) Cvar_SetValueQuick(&vid_fullscreen, true); + width = 0; + height = 0; if ((i = COM_CheckParm("-width")) != 0) - Cvar_SetQuick(&vid_width, com_argv[i+1]); + width = atoi(com_argv[i+1]); if ((i = COM_CheckParm("-height")) != 0) - Cvar_SetQuick(&vid_height, com_argv[i+1]); + height = atoi(com_argv[i+1]); + if (width == 0) + width = height * 4 / 3; + if (height == 0) + height = width * 3 / 4; + if (width) + Cvar_SetValueQuick(&vid_width, width); + if (height) + Cvar_SetValueQuick(&vid_height, height); if ((i = COM_CheckParm("-bpp")) != 0) Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]); - if ((i = COM_CheckParm("-nostencil")) != 0) - Cvar_SetValueQuick(&vid_stencil, 0); - if ((i = COM_CheckParm("-stencil")) != 0) - Cvar_SetValueQuick(&vid_stencil, 1); } - if (vid_stencil.integer && vid_bitsperpixel.integer != 32) - { - Con_Printf("vid_stencil not allowed without vid_bitsperpixel 32, turning off vid_stencil\n"); - Cvar_SetValueQuick(&vid_stencil, 0); - } - - Con_Printf("Starting video system\n"); - if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.integer)) + Con_DPrintf("Starting video system\n"); + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer)) { Con_Printf("Desired video mode fail, trying fallbacks...\n"); - if (!vid_stencil.integer || !VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, false)) + if (vid_fullscreen.integer) { - if (vid_fullscreen.integer) - { - if (!VID_Mode(true, 640, 480, 16, false)) - if (!VID_Mode(false, 640, 480, 16, false)) - Sys_Error("Video modes failed\n"); - } - else - Sys_Error("Windowed video failed\n"); + if (!VID_Mode(true, 640, 480, 16)) + if (!VID_Mode(false, 640, 480, 16)) + Sys_Error("Video modes failed\n"); } + else + Sys_Error("Windowed video failed\n"); } VID_OpenSystems(); } @@ -571,3 +781,4 @@ void VID_Close(void) VID_CloseSystems(); VID_Shutdown(); } +