X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=98cdb8fbe044591d06435df796e2bda0a77211de;hb=cac98d2d118bcf67d65f51f6ec325a06dacd51c3;hp=79451a54ec33ad94b3e54f713ab37a5d6cd4aa53;hpb=c4ee1bbcc6b2f917465f07269ad09942bbf40849;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 79451a54..98cdb8fb 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -12,6 +12,9 @@ int gl_combine_extension = false; // LordHavoc: GL_EXT_compiled_vertex_array support int gl_supportslockarrays = false; +int gl_maxdrawrangeelementsvertices; +int gl_maxdrawrangeelementsindices; + cvar_t vid_mode = {0, "vid_mode", "0"}; cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"}; cvar_t vid_fullscreen = {0, "vid_fullscreen", "1"}; @@ -20,6 +23,8 @@ 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 m_filter = {CVAR_SAVE, "m_filter","0"}; + // GL_ARB_multitexture void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat); void (GLAPIENTRY *qglActiveTexture) (GLenum); @@ -29,6 +34,110 @@ void (GLAPIENTRY *qglClientActiveTexture) (GLenum); void (GLAPIENTRY *qglLockArraysEXT) (GLint first, GLint count); void (GLAPIENTRY *qglUnlockArraysEXT) (void); + +// general GL functions + +void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); + +void (GLAPIENTRY *qglClear)(GLbitfield mask); + +//void (GLAPIENTRY *qglAlphaFunc)(GLenum func, GLclampf ref); +void (GLAPIENTRY *qglBlendFunc)(GLenum sfactor, GLenum dfactor); +void (GLAPIENTRY *qglCullFace)(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); + +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 *qglGetIntegerv)(GLenum pname, GLint *params); + +GLenum (GLAPIENTRY *qglGetError)(void); +const GLubyte* (GLAPIENTRY *qglGetString)(GLenum name); +void (GLAPIENTRY *qglFinish)(void); +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 *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 *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 *qglColor4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte 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 *qglMatrixMode)(GLenum mode); +void (GLAPIENTRY *qglOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); +void (GLAPIENTRY *qglFrustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val); +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 *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 *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 *qglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); + +//void (GLAPIENTRY *qglStencilFunc)(GLenum func, GLint ref, GLuint mask); +//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 *qglTexEnvi)(GLenum target, GLenum pname, GLint param); + +//void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param); + +void (GLAPIENTRY *qglBindTexture)(GLenum target, GLuint texture); +void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); +void (GLAPIENTRY *qglDeleteTextures)(GLsizei n, const GLuint *textures); + +void (GLAPIENTRY *qglDrawRangeElementsEXT)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); + +//void (GLAPIENTRY *qglColorTableEXT)(int, int, int, int, int, const void *); + +#if WIN32 +int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *); +int (WINAPI *qwglDescribePixelFormat)(HDC, int, UINT, LPPIXELFORMATDESCRIPTOR); +//int (WINAPI *qwglGetPixelFormat)(HDC); +BOOL (WINAPI *qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *); +BOOL (WINAPI *qwglSwapBuffers)(HDC); +HGLRC (WINAPI *qwglCreateContext)(HDC); +BOOL (WINAPI *qwglDeleteContext)(HGLRC); +PROC (WINAPI *qwglGetProcAddress)(LPCSTR); +BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC); +//BOOL (WINAPI *qwglSwapIntervalEXT)(int interval); +#endif + + typedef struct { char *name; @@ -45,6 +154,113 @@ typedef struct } gl_extensioninfo_t; +#if WIN32 +static gl_extensionfunctionlist_t wglfuncs[] = +{ + {"wglChoosePixelFormat", (void **) &qwglChoosePixelFormat}, + {"wglDescribePixelFormat", (void **) &qwglDescribePixelFormat}, +// {"wglGetPixelFormat", (void **) &qwglGetPixelFormat}, + {"wglSetPixelFormat", (void **) &qwglSetPixelFormat}, + {"wglSwapBuffers", (void **) &qwglSwapBuffers}, + {"wglCreateContext", (void **) &qwglCreateContext}, + {"wglDeleteContext", (void **) &qwglDeleteContext}, + {"wglGetProcAddress", (void **) &qwglGetProcAddress}, + {"wglMakeCurrent", (void **) &qwglMakeCurrent}, + {NULL, NULL} +}; + +/* +static gl_extensionfunctionlist_t wglswapintervalfuncs[] = +{ + {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT}, + {NULL, NULL} +}; +*/ +#endif + +static gl_extensionfunctionlist_t opengl110funcs[] = +{ + {"glClearColor", (void **) &qglClearColor}, + {"glClear", (void **) &qglClear}, +// {"glAlphaFunc", (void **) &qglAlphaFunc}, + {"glBlendFunc", (void **) &qglBlendFunc}, + {"glCullFace", (void **) &qglCullFace}, + {"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}, + {"glGetIntegerv", (void **) &qglGetIntegerv}, + {"glGetError", (void **) &qglGetError}, + {"glGetString", (void **) &qglGetString}, + {"glFinish", (void **) &qglFinish}, + {"glFlush", (void **) &qglFlush}, + {"glClearDepth", (void **) &qglClearDepth}, + {"glDepthFunc", (void **) &qglDepthFunc}, + {"glDepthMask", (void **) &qglDepthMask}, + {"glDepthRange", (void **) &qglDepthRange}, + {"glDrawElements", (void **) &qglDrawElements}, + {"glVertexPointer", (void **) &qglVertexPointer}, +// {"glNormalPointer", (void **) &qglNormalPointer}, + {"glColorPointer", (void **) &qglColorPointer}, + {"glTexCoordPointer", (void **) &qglTexCoordPointer}, + {"glArrayElement", (void **) &qglArrayElement}, + {"glColor4ub", (void **) &qglColor4ub}, + {"glTexCoord2f", (void **) &qglTexCoord2f}, + {"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}, +// {"glLoadMatrixd", (void **) &qglLoadMatrixd}, +// {"glLoadMatrixf", (void **) &qglLoadMatrixf}, +// {"glMultMatrixd", (void **) &qglMultMatrixd}, +// {"glMultMatrixf", (void **) &qglMultMatrixf}, +// {"glRotated", (void **) &qglRotated}, + {"glRotatef", (void **) &qglRotatef}, +// {"glScaled", (void **) &qglScaled}, +// {"glScalef", (void **) &qglScalef}, +// {"glTranslated", (void **) &qglTranslated}, + {"glTranslatef", (void **) &qglTranslatef}, + {"glReadPixels", (void **) &qglReadPixels}, +// {"glStencilFunc", (void **) &qglStencilFunc}, +// {"glStencilMask", (void **) &qglStencilMask}, +// {"glStencilOp", (void **) &qglStencilOp}, +// {"glClearStencil", (void **) &qglClearStencil}, +// {"glTexEnvf", (void **) &qglTexEnvf}, + {"glTexEnvi", (void **) &qglTexEnvi}, +// {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameteri", (void **) &qglTexParameteri}, + {"glBindTexture", (void **) &qglBindTexture}, + {"glTexImage2D", (void **) &qglTexImage2D}, + {"glTexSubImage2D", (void **) &qglTexSubImage2D}, + {"glDeleteTextures", (void **) &qglDeleteTextures}, + {NULL, NULL} +}; + +static gl_extensionfunctionlist_t drawrangeelementsfuncs[] = +{ + {"glDrawRangeElements", (void **) &qglDrawRangeElements}, + {NULL, NULL} +}; + +static gl_extensionfunctionlist_t drawrangeelementsextfuncs[] = +{ + {"glDrawRangeElementsEXT", (void **) &qglDrawRangeElementsEXT}, + {NULL, NULL} +}; + static gl_extensionfunctionlist_t multitexturefuncs[] = { {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f}, @@ -64,13 +280,17 @@ static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] = #include #endif -#ifndef WIN32 +#ifdef WIN32 +static HINSTANCE gldll; +#else static void *prjobj = NULL; #endif static void gl_getfuncs_begin(void) { -#ifndef WIN32 +#ifdef WIN32 + gldll = LoadLibrary("opengl32.dll"); +#else if (prjobj) dlclose(prjobj); @@ -85,26 +305,32 @@ static void gl_getfuncs_begin(void) static void gl_getfuncs_end(void) { -#ifndef WIN32 +#ifdef WIN32 + FreeLibrary(gldll); +#else if (prjobj) - { dlclose(prjobj); - prjobj = NULL; - } + prjobj = NULL; #endif } static void *gl_getfuncaddress(char *name) { + void *p = NULL; #ifdef WIN32 - return (void *) wglGetProcAddress(name); + if (qwglGetProcAddress != NULL) + p = (void *) qwglGetProcAddress(name); + if (p == NULL) + p = (void *) GetProcAddress(gldll, name); #else - return (void *) dlsym(prjobj, name); + p = (void *) dlsym(prjobj, name); #endif + return p; } -static int gl_checkextension(char *name, gl_extensionfunctionlist_t *funcs, char *disableparm) +static int gl_checkextension(char *name, gl_extensionfunctionlist_t *funcs, char *disableparm, int silent) { + int failed = false; gl_extensionfunctionlist_t *func; Con_Printf("checking for %s... ", name); @@ -118,16 +344,21 @@ static int gl_checkextension(char *name, gl_extensionfunctionlist_t *funcs, char return false; } - if (strstr(gl_extensions, name)) + if (strncmp(name, "GL_", 3) || strstr(gl_extensions, name)) { for (func = funcs;func && func->name != NULL;func++) { + // functions are cleared before all the extensions are evaluated if (!(*func->funcvariable = (void *) gl_getfuncaddress(func->name))) { - Con_Printf("missing function \"%s\"!\n", func->name); - return false; + if (!silent) + Con_Printf("missing function \"%s\" - broken driver!\n", func->name); + failed = true; } } + // delay the return so it prints all missing functions + if (failed) + return false; Con_Printf("enabled\n"); return true; } @@ -148,18 +379,47 @@ void VID_CheckExtensions(void) gl_supportslockarrays = false; gl_textureunits = 1; - if (gl_checkextension("GL_ARB_multitexture", multitexturefuncs, "-nomtex")) +#if WIN32 + if (!gl_checkextension("wgl", wglfuncs, NULL, false)) + Sys_Error("wgl functions not found\n"); + //gl_checkextension("wglSwapIntervalEXT", wglswapintervalfuncs, NULL, false); +#endif + + if (!gl_checkextension("OpenGL 1.1.0", opengl110funcs, NULL, false)) + Sys_Error("OpenGL 1.1.0 functions not found\n"); + + if (gl_checkextension("glDrawRangeElements", drawrangeelementsfuncs, "-nodrawrangeelements", true) + || gl_checkextension("GL_EXT_draw_range_elements", drawrangeelementsextfuncs, "-nodrawrangeelements", true)) + { + qglGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &gl_maxdrawrangeelementsvertices); + qglGetIntegerv(GL_MAX_ELEMENTS_INDICES, &gl_maxdrawrangeelementsindices); + + if (gl_maxdrawrangeelementsvertices < 1 || gl_maxdrawrangeelementsindices < 1) + { + Con_Printf("invalid GL_MAX_ELEMENTS_VERTICES (%i) and/or GL_MAX_ELEMENTS_INDICES (%i)\n", gl_maxdrawrangeelementsvertices, gl_maxdrawrangeelementsindices); + qglDrawRangeElements = qglDrawRangeElementsEXT = NULL; + } + } + + if (gl_checkextension("GL_ARB_multitexture", multitexturefuncs, "-nomtex", false)) { - glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_textureunits); + qglGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_textureunits); if (gl_textureunits > 1) - gl_combine_extension = gl_checkextension("GL_ARB_texture_env_combine", NULL, "-nocombine") || gl_checkextension("GL_EXT_texture_env_combine", NULL, "-nocombine"); + gl_combine_extension = gl_checkextension("GL_ARB_texture_env_combine", NULL, "-nocombine", false) || gl_checkextension("GL_EXT_texture_env_combine", NULL, "-nocombine", false); else + { + Con_Printf("GL_ARB_multitexture with less than 2 units? - BROKEN DRIVER!\n"); gl_textureunits = 1; // for sanity sake, make sure it's not 0 + } } - gl_supportslockarrays = gl_checkextension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva"); + gl_supportslockarrays = gl_checkextension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false); gl_getfuncs_end(); + + // 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; } void Force_CenterView_f (void) @@ -167,6 +427,61 @@ void Force_CenterView_f (void) cl.viewangles[PITCH] = 0; } +void IN_PreMove(void) +{ +} + +void CL_AdjustAngles(void); +void IN_PostMove(void) +{ + // clamp after the move as well to prevent messed up rendering angles + CL_AdjustAngles(); +} + +void IN_Mouse(usercmd_t *cmd, float mx, float my) +{ + int mouselook = (in_mlook.state & 1) || freelook.integer; + float mouse_x, mouse_y; + static float old_mouse_x = 0, old_mouse_y = 0; + + if (m_filter.integer) + { + mouse_x = (mx + old_mouse_x) * 0.5; + mouse_y = (my + old_mouse_y) * 0.5; + } + else + { + mouse_x = mx; + mouse_y = my; + } + + old_mouse_x = mx; + old_mouse_y = my; + + // LordHavoc: viewzoom affects mouse sensitivity for sniping + mouse_x *= sensitivity.value * cl.viewzoom; + mouse_y *= sensitivity.value * cl.viewzoom; + + // Add mouse X/Y movement to cmd + if ((in_strafe.state & 1) || (lookstrafe.integer && mouselook)) + cmd->sidemove += m_side.value * mouse_x; + else + cl.viewangles[YAW] -= m_yaw.value * mouse_x; + + if (mouselook) + V_StopPitchDrift(); + + if (mouselook && !(in_strafe.state & 1)) + cl.viewangles[PITCH] += m_pitch.value * mouse_y; + else + { + if ((in_strafe.state & 1) && noclip_anglehack) + cmd->upmove -= m_forward.value * mouse_y; + else + cmd->forwardmove -= m_forward.value * mouse_y; + } +} + void VID_InitCvars(void) { Cvar_RegisterVariable(&vid_mode); @@ -175,5 +490,6 @@ void VID_InitCvars(void) Cvar_RegisterVariable(&gl_combine); Cvar_RegisterVariable(&in_pitch_min); Cvar_RegisterVariable(&in_pitch_max); + Cvar_RegisterVariable(&m_filter); Cmd_AddCommand("force_centerview", Force_CenterView_f); }