X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=a65d5a72f3ea3890e5c92479dc4cf7abbd511221;hb=23c506a3c99de3aea806132979ab8f8abd0208da;hp=5cc2ed07b24577e7828eeb23ad5cb0177cf1fb9a;hpb=c81bd4048becce63f54e735a2d7826480b9cb551;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 5cc2ed07..a65d5a72 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -8,25 +8,34 @@ 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; +// 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 = false; +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; -cvar_t vid_fullscreen = {0, "vid_fullscreen", "1"}; -cvar_t vid_width = {0, "vid_width", "640"}; -cvar_t vid_height = {0, "vid_height", "480"}; -cvar_t vid_bitsperpixel = {0, "vid_bitsperpixel", "16"}; +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_mouse = {CVAR_SAVE, "vid_mouse", "1"}; cvar_t gl_combine = {0, "gl_combine", "1"}; @@ -95,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); @@ -104,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); @@ -131,28 +141,45 @@ 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 *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 *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 *); +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); + + int GL_CheckExtension(const char *name, const gl_extensionfunctionlist_t *funcs, const char *disableparm, int silent) { int failed = false; @@ -221,12 +248,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}, @@ -250,20 +278,31 @@ static gl_extensionfunctionlist_t opengl110funcs[] = // {"glTranslated", (void **) &qglTranslated}, {"glTranslatef", (void **) &qglTranslatef}, {"glReadPixels", (void **) &qglReadPixels}, -// {"glStencilFunc", (void **) &qglStencilFunc}, -// {"glStencilMask", (void **) &qglStencilMask}, -// {"glStencilOp", (void **) &qglStencilOp}, -// {"glClearStencil", (void **) &qglClearStencil}, -// {"glTexEnvf", (void **) &qglTexEnvf}, + {"glStencilFunc", (void **) &qglStencilFunc}, + {"glStencilMask", (void **) &qglStencilMask}, + {"glStencilOp", (void **) &qglStencilOp}, + {"glClearStencil", (void **) &qglClearStencil}, + {"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}, {NULL, NULL} }; @@ -294,9 +333,19 @@ static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] = {NULL, NULL} }; +static gl_extensionfunctionlist_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; @@ -317,15 +366,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 @@ -393,43 +440,123 @@ void IN_Mouse(usercmd_t *cmd, float mx, float my) } } -void VID_InitCvars(void) +void VID_Shared_Init(void) { - int i; - 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); Cvar_RegisterVariable(&in_pitch_max); Cvar_RegisterVariable(&m_filter); Cmd_AddCommand("force_centerview", Force_CenterView_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]); + Cmd_AddCommand("vid_restart", VID_Restart_f); } -extern int VID_InitMode (int fullscreen, int width, int height, int bpp); -int VID_Mode(int fullscreen, int width, int height, int bpp) +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) { - if (fullscreen) - Con_Printf("Video: %dx%dx%d fullscreen\n", width, height, bpp); - else - Con_Printf("Video: %dx%d windowed\n", width, height); - if (VID_InitMode(fullscreen, width, height, 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)) + { + 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 return false; } + +static void VID_OpenSystems(void) +{ + R_Modules_Start(); + S_Open(); + CDAudio_Open(); +} + +static void VID_CloseSystems(void) +{ + CDAudio_Close(); + S_Close(); + 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"); + VID_Close(); + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_stencil.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)) + Sys_Error("Unable to restore to last working video mode\n"); + } + 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); + } + + 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_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_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"); + } + } + VID_OpenSystems(); +} + +void VID_Close(void) +{ + VID_CloseSystems(); + VID_Shutdown(); +}