X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=2b1b370cdd695d52a8699165d1244d5cc2bb6b0d;hb=a2abf4addfa875d01c2775098277fea38ee99e24;hp=0806ce062db28d6ae2ff5f30a67ce9ed942d8f96;hpb=1f7e4ae8b04d68b88f1c63c87a6b819b2a4a76f6;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 0806ce06..2b1b370c 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -8,16 +8,22 @@ viddef_t vid; qboolean isG200 = false; // LordHavoc: the Matrox G200 can't do per pixel alpha, and it uses a D3D driver for GL... ugh... qboolean isRagePro = false; // LordHavoc: the ATI Rage Pro has limitations with per pixel alpha (the color scaler does not apply to per pixel alpha images...), although not as bad as a G200. -// LordHavoc: GL_ARB_multitexture support +// GL_ARB_multitexture int gl_textureunits = 0; -// LordHavoc: GL_ARB_texture_env_combine or GL_EXT_texture_env_combine support +// GL_ARB_texture_env_combine or GL_EXT_texture_env_combine int gl_combine_extension = false; -// LordHavoc: GL_EXT_compiled_vertex_array support +// GL_EXT_compiled_vertex_array int gl_supportslockarrays = false; -// LordHavoc: GLX_SGI_video_sync and WGL_EXT_swap_control +// GLX_SGI_video_sync or WGL_EXT_swap_control int gl_videosyncavailable = false; -// indicates that stencil is available +// stencil available int gl_stencil = false; +// 3D textures available +int gl_texture3d = false; +// GL_ARB_texture_cubemap +int gl_texturecubemap = false; +// GL_ARB_texture_env_dot3 +int gl_dot3arb = false; // LordHavoc: if window is hidden, don't update screen int vid_hidden = true; @@ -98,6 +104,7 @@ 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 *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); @@ -107,7 +114,7 @@ void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, cons 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 *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); @@ -139,27 +146,47 @@ 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 *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); -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 *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); +GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture); 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); +void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, 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 *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); + + 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 *); -int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent) +void (GLAPIENTRY *qglTexImage3D)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +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 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); @@ -197,7 +224,7 @@ 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}, @@ -224,12 +251,13 @@ static gl_extensionfunctionlist_t opengl110funcs[] = {"glDepthMask", (void **) &qglDepthMask}, {"glDepthRange", (void **) &qglDepthRange}, {"glDrawElements", (void **) &qglDrawElements}, + {"glColorMask", (void **) &qglColorMask}, {"glVertexPointer", (void **) &qglVertexPointer}, // {"glNormalPointer", (void **) &qglNormalPointer}, {"glColorPointer", (void **) &qglColorPointer}, {"glTexCoordPointer", (void **) &qglTexCoordPointer}, {"glArrayElement", (void **) &qglArrayElement}, - {"glColor4ub", (void **) &qglColor4ub}, + {"glColor4f", (void **) &qglColor4f}, {"glTexCoord2f", (void **) &qglTexCoord2f}, {"glVertex2f", (void **) &qglVertex2f}, {"glVertex3f", (void **) &qglVertex3f}, @@ -257,32 +285,45 @@ static gl_extensionfunctionlist_t opengl110funcs[] = {"glStencilMask", (void **) &qglStencilMask}, {"glStencilOp", (void **) &qglStencilOp}, {"glClearStencil", (void **) &qglClearStencil}, -// {"glTexEnvf", (void **) &qglTexEnvf}, + {"glTexEnvf", (void **) &qglTexEnvf}, {"glTexEnvi", (void **) &qglTexEnvi}, -// {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameterfv", (void **) &qglTexParameterfv}, {"glTexParameteri", (void **) &qglTexParameteri}, + {"glPixelStoref", (void **) &qglPixelStoref}, + {"glPixelStorei", (void **) &qglPixelStorei}, + {"glGenTextures", (void **) &qglGenTextures}, + {"glDeleteTextures", (void **) &qglDeleteTextures}, {"glBindTexture", (void **) &qglBindTexture}, + {"glPrioritizeTextures", (void **) &qglPrioritizeTextures}, + {"glAreTexturesResident", (void **) &qglAreTexturesResident}, + {"glIsTexture", (void **) &qglIsTexture}, + {"glTexImage1D", (void **) &qglTexImage1D}, {"glTexImage2D", (void **) &qglTexImage2D}, + {"glTexSubImage1D", (void **) &qglTexSubImage1D}, {"glTexSubImage2D", (void **) &qglTexSubImage2D}, - {"glDeleteTextures", (void **) &qglDeleteTextures}, - {"glPixelStoref", (void **) &qglPixelStoref}, - {"glPixelStorei", (void **) &qglPixelStorei}, + {"glCopyTexImage1D", (void **) &qglCopyTexImage1D}, + {"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}, {"glActiveTextureARB", (void **) &qglActiveTexture}, @@ -290,16 +331,26 @@ static gl_extensionfunctionlist_t multitexturefuncs[] = {NULL, NULL} }; -static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] = +static dllfunction_t compiledvertexarrayfuncs[] = { {"glLockArraysEXT", (void **) &qglLockArraysEXT}, {"glUnlockArraysEXT", (void **) &qglUnlockArraysEXT}, {NULL, NULL} }; +static dllfunction_t texture3dextfuncs[] = +{ + {"glTexImage3DEXT", (void **) &qglTexImage3D}, + {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D}, + {"glCopyTexSubImage3DEXT", (void **) &qglCopyTexSubImage3D}, + {NULL, NULL} +}; + void VID_CheckExtensions(void) { + gl_stencil = vid_stencil.integer; gl_combine_extension = false; + gl_dot3arb = false; gl_supportslockarrays = false; gl_textureunits = 1; @@ -320,15 +371,13 @@ void VID_CheckExtensions(void) if (GL_CheckExtension("GL_ARB_multitexture", multitexturefuncs, "-nomtex", false)) { qglGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_textureunits); - if (gl_textureunits > 1) - 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_combine_extension = GL_CheckExtension("GL_ARB_texture_env_combine", NULL, "-nocombine", false) || GL_CheckExtension("GL_EXT_texture_env_combine", NULL, "-nocombine", false); + if (gl_combine_extension) + gl_dot3arb = GL_CheckExtension("GL_ARB_texture_env_dot3", NULL, "-nodot3", 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); // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code @@ -398,8 +447,6 @@ void IN_Mouse(usercmd_t *cmd, float mx, float my) void VID_Shared_Init(void) { - int i; - Cvar_RegisterVariable(&vid_fullscreen); Cvar_RegisterVariable(&vid_width); Cvar_RegisterVariable(&vid_height); @@ -412,22 +459,6 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&m_filter); Cmd_AddCommand("force_centerview", Force_CenterView_f); Cmd_AddCommand("vid_restart", VID_Restart_f); - -// interpret command-line parameters - if ((i = COM_CheckParm("-window")) != 0) - Cvar_SetValueQuick(&vid_fullscreen, false); - if ((i = COM_CheckParm("-fullscreen")) != 0) - Cvar_SetValueQuick(&vid_fullscreen, true); - if ((i = COM_CheckParm("-width")) != 0) - Cvar_SetQuick(&vid_width, com_argv[i+1]); - if ((i = COM_CheckParm("-height")) != 0) - Cvar_SetQuick(&vid_height, com_argv[i+1]); - 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); } int current_vid_fullscreen; @@ -486,8 +517,36 @@ void VID_Restart_f(void) VID_OpenSystems(); } +int vid_commandlinecheck = true; void VID_Open(void) { + int i; + if (vid_commandlinecheck) + { + // interpret command-line parameters + vid_commandlinecheck = false; + if ((i = COM_CheckParm("-window")) != 0) + Cvar_SetValueQuick(&vid_fullscreen, false); + if ((i = COM_CheckParm("-fullscreen")) != 0) + Cvar_SetValueQuick(&vid_fullscreen, true); + if ((i = COM_CheckParm("-width")) != 0) + Cvar_SetQuick(&vid_width, com_argv[i+1]); + if ((i = COM_CheckParm("-height")) != 0) + Cvar_SetQuick(&vid_height, com_argv[i+1]); + 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)) {