X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=8f33726427d5e70fb4d6dba5dab664b6614a11c0;hb=fe0d81655d6c8f5b722fea3282a99a734134b73b;hp=55efef3557bb510d8a612182fa8edf2256faa986;hpb=cd84535c9bee3c6e7afe080953e609b64bbaa7ac;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 55efef35..8f337264 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -24,12 +24,28 @@ 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; // 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 +56,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 +94,7 @@ 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 *qglActiveTexture) (GLenum); void (GLAPIENTRY *qglClientActiveTexture) (GLenum); @@ -70,6 +102,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,8 +118,8 @@ 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); @@ -90,9 +127,9 @@ void (GLAPIENTRY *qglDisable)(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); @@ -103,7 +140,7 @@ 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); @@ -112,14 +149,14 @@ void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, con //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 *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); @@ -128,16 +165,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); @@ -149,15 +186,16 @@ 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 *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); @@ -178,11 +216,14 @@ void (GLAPIENTRY *qglTexImage3D)(GLenum target, GLint level, GLenum internalForm void (GLAPIENTRY *qglTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); void (GLAPIENTRY *qglCopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height); + +void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units); -int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent) +int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *disableparm, int silent) { int failed = false; - const gl_extensionfunctionlist_t *func; + const dllfunction_t *func; Con_Printf("checking for %s... ", name); @@ -220,23 +261,23 @@ int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, } } -static gl_extensionfunctionlist_t opengl110funcs[] = +static dllfunction_t opengl110funcs[] = { {"glClearColor", (void **) &qglClearColor}, {"glClear", (void **) &qglClear}, // {"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}, {"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}, @@ -245,20 +286,20 @@ static gl_extensionfunctionlist_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}, {"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}, +// {"glVertex2f", (void **) &qglVertex2f}, +// {"glVertex3f", (void **) &qglVertex3f}, +// {"glBegin", (void **) &qglBegin}, +// {"glEnd", (void **) &qglEnd}, {"glMatrixMode", (void **) &qglMatrixMode}, {"glOrtho", (void **) &qglOrtho}, {"glFrustum", (void **) &qglFrustum}, @@ -266,16 +307,16 @@ static gl_extensionfunctionlist_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}, @@ -284,14 +325,15 @@ static gl_extensionfunctionlist_t opengl110funcs[] = // {"glTexEnvf", (void **) &qglTexEnvf}, {"glTexEnvi", (void **) &qglTexEnvi}, // {"glTexParameterf", (void **) &qglTexParameterf}, +// {"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}, @@ -301,37 +343,39 @@ static gl_extensionfunctionlist_t opengl110funcs[] = {"glCopyTexImage2D", (void **) &qglCopyTexImage2D}, {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D}, {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D}, + {"glScissor", (void **) &qglScissor}, + {"glPolygonOffset", (void **) &qglPolygonOffset}, {NULL, NULL} }; -static gl_extensionfunctionlist_t drawrangeelementsfuncs[] = +static dllfunction_t drawrangeelementsfuncs[] = { {"glDrawRangeElements", (void **) &qglDrawRangeElements}, {NULL, NULL} }; -static gl_extensionfunctionlist_t drawrangeelementsextfuncs[] = +static dllfunction_t drawrangeelementsextfuncs[] = { {"glDrawRangeElementsEXT", (void **) &qglDrawRangeElementsEXT}, {NULL, NULL} }; -static gl_extensionfunctionlist_t multitexturefuncs[] = +static dllfunction_t multitexturefuncs[] = { - {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, + //{"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, {"glActiveTextureARB", (void **) &qglActiveTexture}, {"glClientActiveTextureARB", (void **) &qglClientActiveTexture}, {NULL, NULL} }; -static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] = +static dllfunction_t compiledvertexarrayfuncs[] = { {"glLockArraysEXT", (void **) &qglLockArraysEXT}, {"glUnlockArraysEXT", (void **) &qglUnlockArraysEXT}, {NULL, NULL} }; -static gl_extensionfunctionlist_t texture3dfuncs[] = +static dllfunction_t texture3dextfuncs[] = { {"glTexImage3DEXT", (void **) &qglTexImage3D}, {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D}, @@ -339,6 +383,25 @@ static gl_extensionfunctionlist_t texture3dfuncs[] = {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; @@ -346,6 +409,9 @@ 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"); @@ -369,15 +435,55 @@ void VID_CheckExtensions(void) gl_dot3arb = GL_CheckExtension("GL_ARB_texture_env_dot3", NULL, "-nodot3", false); } - gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dfuncs, "-notexture3d", false); + 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); // 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; @@ -438,8 +544,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); @@ -513,7 +725,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 @@ -522,10 +734,20 @@ 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) @@ -534,6 +756,12 @@ void VID_Open(void) 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)) { @@ -558,3 +786,4 @@ void VID_Close(void) VID_CloseSystems(); VID_Shutdown(); } +