X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_shared.c;h=1bfff4511b086854135841e8035bd85e20f3b6d5;hp=212118b7d528e6ed754db583ebed1f2509224fd0;hb=12a61f445c6bc468a2fbd979bd4713215eeb7831;hpb=1740f737276f086c2f19758f72881a20e5070b57 diff --git a/vid_shared.c b/vid_shared.c index 212118b7..1bfff451 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; @@ -34,8 +40,8 @@ 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"}; @@ -56,7 +62,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); @@ -75,8 +81,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); @@ -84,9 +90,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); @@ -97,7 +103,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); @@ -106,14 +112,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); @@ -122,16 +128,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); @@ -142,25 +148,45 @@ 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); +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 *qglDeleteTextures)(GLsizei n, const GLuint *textures); -void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param); -void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param); +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); @@ -198,23 +224,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}, @@ -223,20 +249,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}, @@ -244,16 +270,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}, @@ -262,46 +288,69 @@ static gl_extensionfunctionlist_t opengl110funcs[] = // {"glTexEnvf", (void **) &qglTexEnvf}, {"glTexEnvi", (void **) &qglTexEnvi}, // {"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}, + //{"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 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; @@ -322,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 @@ -400,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); @@ -414,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; @@ -488,8 +517,46 @@ void VID_Restart_f(void) VID_OpenSystems(); } +int vid_commandlinecheck = true; void VID_Open(void) { + int i, width, height; + 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); + width = 0; + height = 0; + if ((i = COM_CheckParm("-width")) != 0) + width = atoi(com_argv[i+1]); + if ((i = COM_CheckParm("-height")) != 0) + 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)) {