X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=c5af66c524166e5360a075dbf841c8c99dd92de8;hb=779192f83f5c0e6ef6c692f7c116afaa55b51c93;hp=daf9b0456a0dc9625c7ba4c4f446c458b4743fe9;hpb=144f44c523edfab569e960288dd6d84ad7f4d5f4;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index daf9b045..c5af66c5 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -20,6 +20,7 @@ float in_windowmouse_x, in_windowmouse_y; int gl_max_texture_size = 0; int gl_max_3d_texture_size = 0; int gl_max_cube_map_texture_size = 0; +int gl_max_rectangle_texture_size = 0; // GL_ARB_multitexture int gl_textureunits = 1; // GL_ARB_texture_env_combine or GL_EXT_texture_env_combine @@ -34,10 +35,16 @@ int gl_stencil = false; int gl_texture3d = false; // GL_ARB_texture_cubemap int gl_texturecubemap = false; +// GL_ARB_texture_rectangle +int gl_texturerectangle = false; // GL_ARB_texture_non_power_of_two int gl_support_arb_texture_non_power_of_two = false; // GL_ARB_texture_env_dot3 int gl_dot3arb = false; +// GL_ARB_depth_texture +int gl_depthtexture = false; +// GL_ARB_shadow +int gl_support_arb_shadow = false; // GL_SGIS_texture_edge_clamp int gl_support_clamptoedge = false; // GL_EXT_texture_filter_anisotropic @@ -61,10 +68,16 @@ int gl_support_vertex_shader = false; int gl_support_fragment_shader = false; //GL_ARB_vertex_buffer_object int gl_support_arb_vertex_buffer_object = false; +//GL_EXT_framebuffer_object +int gl_support_ext_framebuffer_object = false; //GL_ARB_texture_compression int gl_support_texture_compression = false; //GL_ARB_occlusion_query int gl_support_arb_occlusion_query = false; +//GL_AMD_texture_texture4 +int gl_support_amd_texture_texture4 = false; +//GL_ARB_texture_gather +int gl_support_arb_texture_gather = false; // LordHavoc: if window is hidden, don't update screen qboolean vid_hidden = true; @@ -74,6 +87,15 @@ qboolean vid_activewindow = true; // we don't know until we try it! cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported","1", "indicates whether hardware gamma is supported (updated by attempts to set hardware gamma ramps)"}; + +// VorteX: more info cvars, mostly set in VID_CheckExtensions +cvar_t gl_info_vendor = {CVAR_READONLY, "gl_info_vendor", "", "indicates brand of graphics chip"}; +cvar_t gl_info_renderer = {CVAR_READONLY, "gl_info_renderer", "", "indicates graphics chip model and other information"}; +cvar_t gl_info_version = {CVAR_READONLY, "gl_info_version", "", "indicates version of current renderer. begins with 1.0.0, 1.1.0, 1.2.0, 1.3.1 etc."}; +cvar_t gl_info_extensions = {CVAR_READONLY, "gl_info_extensions", "", "indicates extension list found by engine, space separated."}; +cvar_t gl_info_platform = {CVAR_READONLY, "gl_info_platform", "", "indicates GL platform: WGL, GLX, or AGL."}; +cvar_t gl_info_driver = {CVAR_READONLY, "gl_info_driver", "", "name of driver library (opengl32.dll, libGL.so.1, or whatever)."}; + // whether hardware gamma ramps are currently in effect qboolean vid_usinghwgamma = false; @@ -95,7 +117,7 @@ cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in wi cvar_t vid_grabkeyboard = {CVAR_SAVE, "vid_grabkeyboard", "0", "whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)"}; cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"}; cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"}; -cvar_t gl_combine = {0, "gl_combine", "1", "faster rendering by using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"}; +cvar_t gl_combine = {0, "gl_combine", "1", "enables faster rendering using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"}; cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"}; cvar_t vid_stick_mouse = {CVAR_SAVE, "vid_stick_mouse", "0", "have the mouse stuck in the center of the screen" }; @@ -242,13 +264,13 @@ 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 *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 *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 *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 *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); @@ -376,12 +398,31 @@ GLboolean (GLAPIENTRY *qglUnmapBufferARB) (GLenum target); void (GLAPIENTRY *qglBufferDataARB) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); void (GLAPIENTRY *qglBufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); +//GL_EXT_framebuffer_object +GLboolean (GLAPIENTRY *qglIsRenderbufferEXT)(GLuint renderbuffer); +void (GLAPIENTRY *qglBindRenderbufferEXT)(GLenum target, GLuint renderbuffer); +void (GLAPIENTRY *qglDeleteRenderbuffersEXT)(GLsizei n, const GLuint *renderbuffers); +void (GLAPIENTRY *qglGenRenderbuffersEXT)(GLsizei n, GLuint *renderbuffers); +void (GLAPIENTRY *qglRenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); +void (GLAPIENTRY *qglGetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint *params); +GLboolean (GLAPIENTRY *qglIsFramebufferEXT)(GLuint framebuffer); +void (GLAPIENTRY *qglBindFramebufferEXT)(GLenum target, GLuint framebuffer); +void (GLAPIENTRY *qglDeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers); +void (GLAPIENTRY *qglGenFramebuffersEXT)(GLsizei n, GLuint *framebuffers); +GLenum (GLAPIENTRY *qglCheckFramebufferStatusEXT)(GLenum target); +//void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +void (GLAPIENTRY *qglFramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +void (GLAPIENTRY *qglFramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +void (GLAPIENTRY *qglFramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +void (GLAPIENTRY *qglGetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint *params); +void (GLAPIENTRY *qglGenerateMipmapEXT)(GLenum target); + void (GLAPIENTRY *qglCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); void (GLAPIENTRY *qglCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); +//void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); void (GLAPIENTRY *qglCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); void (GLAPIENTRY *qglCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); +//void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); void (GLAPIENTRY *qglGetCompressedTexImageARB)(GLenum target, GLint lod, void *img); void (GLAPIENTRY *qglGenQueriesARB)(GLsizei n, GLuint *ids); @@ -402,6 +443,7 @@ int GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, c int failed = false; const dllfunction_t *func; struct { int major, minor; } min_version, curr_version; + char extstr[MAX_INPUTLINE]; int ext; if(sscanf(minglver_or_ext, "%d.%d", &min_version.major, &min_version.minor) == 2) @@ -465,6 +507,10 @@ int GL_CheckExtension(const char *minglver_or_ext, const dllfunction_t *funcs, c // delay the return so it prints all missing functions if (failed) return false; + // VorteX: add to found extension list + dpsnprintf(extstr, sizeof(extstr), "%s %s ", gl_info_extensions.string, minglver_or_ext); + Cvar_SetQuick(&gl_info_extensions, extstr); + Con_DPrint("enabled\n"); return true; } @@ -552,13 +598,13 @@ static dllfunction_t opengl110funcs[] = // {"glPrioritizeTextures", (void **) &qglPrioritizeTextures}, // {"glAreTexturesResident", (void **) &qglAreTexturesResident}, {"glIsTexture", (void **) &qglIsTexture}, - {"glTexImage1D", (void **) &qglTexImage1D}, +// {"glTexImage1D", (void **) &qglTexImage1D}, {"glTexImage2D", (void **) &qglTexImage2D}, - {"glTexSubImage1D", (void **) &qglTexSubImage1D}, +// {"glTexSubImage1D", (void **) &qglTexSubImage1D}, {"glTexSubImage2D", (void **) &qglTexSubImage2D}, - {"glCopyTexImage1D", (void **) &qglCopyTexImage1D}, +// {"glCopyTexImage1D", (void **) &qglCopyTexImage1D}, {"glCopyTexImage2D", (void **) &qglCopyTexImage2D}, - {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D}, +// {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D}, {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D}, {"glScissor", (void **) &qglScissor}, {"glPolygonOffset", (void **) &qglPolygonOffset}, @@ -741,14 +787,36 @@ static dllfunction_t vbofuncs[] = {NULL, NULL} }; +static dllfunction_t fbofuncs[] = +{ + {"glIsRenderbufferEXT" , (void **) &qglIsRenderbufferEXT}, + {"glBindRenderbufferEXT" , (void **) &qglBindRenderbufferEXT}, + {"glDeleteRenderbuffersEXT" , (void **) &qglDeleteRenderbuffersEXT}, + {"glGenRenderbuffersEXT" , (void **) &qglGenRenderbuffersEXT}, + {"glRenderbufferStorageEXT" , (void **) &qglRenderbufferStorageEXT}, + {"glGetRenderbufferParameterivEXT" , (void **) &qglGetRenderbufferParameterivEXT}, + {"glIsFramebufferEXT" , (void **) &qglIsFramebufferEXT}, + {"glBindFramebufferEXT" , (void **) &qglBindFramebufferEXT}, + {"glDeleteFramebuffersEXT" , (void **) &qglDeleteFramebuffersEXT}, + {"glGenFramebuffersEXT" , (void **) &qglGenFramebuffersEXT}, + {"glCheckFramebufferStatusEXT" , (void **) &qglCheckFramebufferStatusEXT}, +// {"glFramebufferTexture1DEXT" , (void **) &qglFramebufferTexture1DEXT}, + {"glFramebufferTexture2DEXT" , (void **) &qglFramebufferTexture2DEXT}, + {"glFramebufferTexture3DEXT" , (void **) &qglFramebufferTexture3DEXT}, + {"glFramebufferRenderbufferEXT" , (void **) &qglFramebufferRenderbufferEXT}, + {"glGetFramebufferAttachmentParameterivEXT" , (void **) &qglGetFramebufferAttachmentParameterivEXT}, + {"glGenerateMipmapEXT" , (void **) &qglGenerateMipmapEXT}, + {NULL, NULL} +}; + static dllfunction_t texturecompressionfuncs[] = { {"glCompressedTexImage3DARB", (void **) &qglCompressedTexImage3DARB}, {"glCompressedTexImage2DARB", (void **) &qglCompressedTexImage2DARB}, - {"glCompressedTexImage1DARB", (void **) &qglCompressedTexImage1DARB}, +// {"glCompressedTexImage1DARB", (void **) &qglCompressedTexImage1DARB}, {"glCompressedTexSubImage3DARB", (void **) &qglCompressedTexSubImage3DARB}, {"glCompressedTexSubImage2DARB", (void **) &qglCompressedTexSubImage2DARB}, - {"glCompressedTexSubImage1DARB", (void **) &qglCompressedTexSubImage1DARB}, +// {"glCompressedTexSubImage1DARB", (void **) &qglCompressedTexSubImage1DARB}, {"glGetCompressedTexImageARB", (void **) &qglGetCompressedTexImageARB}, {NULL, NULL} }; @@ -768,7 +836,8 @@ static dllfunction_t occlusionqueryfuncs[] = void VID_CheckExtensions(void) { - gl_stencil = vid_bitsperpixel.integer == 32; + // VorteX: reset extensions info cvar, it got filled by GL_CheckExtension + Cvar_SetQuick(&gl_info_extensions, ""); // reset all the gl extension variables here // this should match the declarations @@ -780,8 +849,11 @@ void VID_CheckExtensions(void) gl_supportslockarrays = false; gl_texture3d = false; gl_texturecubemap = false; + gl_texturerectangle = false; gl_support_arb_texture_non_power_of_two = false; gl_dot3arb = false; + gl_depthtexture = false; + gl_support_arb_shadow = false; gl_support_clamptoedge = false; gl_support_anisotropy = false; gl_max_anisotropy = 1; @@ -794,8 +866,11 @@ void VID_CheckExtensions(void) gl_support_vertex_shader = false; gl_support_fragment_shader = false; gl_support_arb_vertex_buffer_object = false; + gl_support_ext_framebuffer_object = false; gl_support_texture_compression = false; gl_support_arb_occlusion_query = false; + gl_support_amd_texture_texture4 = false; + gl_support_arb_texture_gather = false; if (!GL_CheckExtension("1.1", opengl110funcs, NULL, false)) Sys_Error("OpenGL 1.1.0 functions not found"); @@ -833,6 +908,14 @@ void VID_CheckExtensions(void) // COMMANDLINEOPTION: GL: -nocubemap disables GL_ARB_texture_cube_map (required for bumpmapping) if ((gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false))) qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, &gl_max_cube_map_texture_size); +// COMMANDLINEOPTION: GL: -norectangle disables GL_ARB_texture_rectangle (required for bumpmapping) + if ((gl_texturerectangle = GL_CheckExtension("GL_ARB_texture_rectangle", NULL, "-norectangle", false))) + qglGetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB, &gl_max_rectangle_texture_size); +// COMMANDLINEOPTION: GL: -nodepthtexture disables use of GL_ARB_depth_texture (required for shadowmapping) + gl_depthtexture = GL_CheckExtension("GL_ARB_depth_texture", NULL, "-nodepthtexture", false); +// COMMANDLINEOPTION: GL: -noshadow disables use of GL_ARB_shadow (required for hardware shadowmap filtering) + gl_support_arb_shadow = GL_CheckExtension("GL_ARB_shadow", NULL, "-noshadow", false); + // COMMANDLINEOPTION: GL: -notexturecompression disables GL_ARB_texture_compression (which saves video memory if it is supported, but can also degrade image quality, see gl_texturecompression cvar documentation for more information) gl_support_texture_compression = GL_CheckExtension("GL_ARB_texture_compression", texturecompressionfuncs, "-notexturecompression", false); // COMMANDLINEOPTION: GL: -nocva disables GL_EXT_compiled_vertex_array (renders faster) @@ -856,6 +939,9 @@ void VID_CheckExtensions(void) // COMMANDLINEOPTION: GL: -novbo disables GL_ARB_vertex_buffer_object (which accelerates rendering) gl_support_arb_vertex_buffer_object = GL_CheckExtension("GL_ARB_vertex_buffer_object", vbofuncs, "-novbo", false); +// COMMANDLINEOPTION: GL: -nofbo disables GL_EXT_framebuffer_object (which accelerates rendering) + gl_support_ext_framebuffer_object = GL_CheckExtension("GL_EXT_framebuffer_object", fbofuncs, "-nofbo", 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; @@ -884,6 +970,18 @@ void VID_CheckExtensions(void) // COMMANDLINEOPTION: GL: -noocclusionquery disables GL_ARB_occlusion_query (which allows coronas to fade according to visibility, and potentially used for rendering optimizations) gl_support_arb_occlusion_query = GL_CheckExtension("GL_ARB_occlusion_query", occlusionqueryfuncs, "-noocclusionquery", false); + +// COMMANDLINEOPTION: GL: -notexture4 disables GL_AMD_texture_texture4 (which provides fetch4 sampling) + gl_support_amd_texture_texture4 = GL_CheckExtension("GL_AMD_texture_texture4", NULL, "-notexture4", false); +// COMMANDLINEOPTION: GL: -notexturegather disables GL_ARB_texture_gather (which provides fetch4 sampling) + gl_support_arb_texture_gather = GL_CheckExtension("GL_ARB_texture_gather", NULL, "-notexturegather", false); + + // VorteX: set other info (maybe place them in VID_InitMode?) + Cvar_SetQuick(&gl_info_vendor, gl_vendor); + Cvar_SetQuick(&gl_info_renderer, gl_renderer); + Cvar_SetQuick(&gl_info_version, gl_version); + Cvar_SetQuick(&gl_info_platform, gl_platform ? gl_platform : ""); + Cvar_SetQuick(&gl_info_driver, gl_driver); } void Force_CenterView_f (void) @@ -1094,6 +1192,12 @@ void VID_RestoreSystemGamma(void) void VID_Shared_Init(void) { Cvar_RegisterVariable(&vid_hardwaregammasupported); + Cvar_RegisterVariable(&gl_info_vendor); + Cvar_RegisterVariable(&gl_info_renderer); + Cvar_RegisterVariable(&gl_info_version); + Cvar_RegisterVariable(&gl_info_extensions); + Cvar_RegisterVariable(&gl_info_platform); + Cvar_RegisterVariable(&gl_info_driver); Cvar_RegisterVariable(&v_gamma); Cvar_RegisterVariable(&v_brightness); Cvar_RegisterVariable(&v_contrastboost); @@ -1134,37 +1238,44 @@ void VID_Shared_Init(void) Cvar_RegisterVariable(&gl_finish); Cmd_AddCommand("force_centerview", Force_CenterView_f, "recenters view (stops looking up/down)"); Cmd_AddCommand("vid_restart", VID_Restart_f, "restarts video system (closes and reopens the window, restarts renderer)"); - if (gamemode == GAME_GOODVSBAD2) - Cvar_Set("gl_combine", "0"); } -int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) +int VID_Mode(int fullscreen, int width, int height, int bpp, float refreshrate, int stereobuffer, int samples) { - int requestedWidth = width; - int requestedHeight = height; + viddef_mode_t mode; + memset(&mode, 0, sizeof(mode)); + mode.fullscreen = fullscreen; + mode.width = width; + mode.height = height; + mode.bitsperpixel = bpp; + mode.refreshrate = vid_userefreshrate.integer ? max(1, refreshrate) : 0; + mode.userefreshrate = vid_userefreshrate.integer; + mode.stereobuffer = stereobuffer; + mode.samples = samples; cl_ignoremousemoves = 2; - Con_Printf("Initializing Video Mode: %s %dx%dx%dx%dhz%s%s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, refreshrate, stereobuffer ? " stereo" : "", samples > 1 ? va(" (%ix AA)", samples) : ""); - if (VID_InitMode(fullscreen, &width, &height, bpp, vid_userefreshrate.integer ? max(1, refreshrate) : 0, stereobuffer, samples)) + if (VID_InitMode(&mode)) { - vid.fullscreen = fullscreen; - vid.width = width; - vid.height = height; - vid.bitsperpixel = bpp; - vid.samples = samples; - vid.refreshrate = refreshrate; - vid.stereobuffer = stereobuffer; - vid.userefreshrate = vid_userefreshrate.integer; - Cvar_SetValueQuick(&vid_fullscreen, fullscreen); - Cvar_SetValueQuick(&vid_width, width); - Cvar_SetValueQuick(&vid_height, height); - Cvar_SetValueQuick(&vid_bitsperpixel, bpp); - Cvar_SetValueQuick(&vid_samples, samples); + // accept the (possibly modified) mode + vid.mode = mode; + vid.fullscreen = vid.mode.fullscreen; + vid.width = vid.mode.width; + vid.height = vid.mode.height; + vid.bitsperpixel = vid.mode.bitsperpixel; + vid.refreshrate = vid.mode.refreshrate; + vid.userefreshrate = vid.mode.userefreshrate; + vid.stereobuffer = vid.mode.stereobuffer; + vid.samples = vid.mode.samples; + gl_stencil = vid.mode.bitsperpixel > 16; + Con_Printf("Video Mode: %s %dx%dx%dx%.2fhz%s%s\n", mode.fullscreen ? "fullscreen" : "window", mode.width, mode.height, mode.bitsperpixel, mode.refreshrate, mode.stereobuffer ? " stereo" : "", mode.samples > 1 ? va(" (%ix AA)", mode.samples) : ""); + + Cvar_SetValueQuick(&vid_fullscreen, vid.mode.fullscreen); + Cvar_SetValueQuick(&vid_width, vid.mode.width); + Cvar_SetValueQuick(&vid_height, vid.mode.height); + Cvar_SetValueQuick(&vid_bitsperpixel, vid.mode.bitsperpixel); + Cvar_SetValueQuick(&vid_samples, vid.mode.samples); if(vid_userefreshrate.integer) - Cvar_SetValueQuick(&vid_refreshrate, refreshrate); - Cvar_SetValueQuick(&vid_stereobuffer, stereobuffer); - - if(width != requestedWidth || height != requestedHeight) - Con_Printf("Chose a similar video mode %dx%d instead of the requested mode %dx%d\n", width, height, requestedWidth, requestedHeight); + Cvar_SetValueQuick(&vid_refreshrate, vid.mode.refreshrate); + Cvar_SetValueQuick(&vid_stereobuffer, vid.mode.stereobuffer); return true; } @@ -1193,14 +1304,14 @@ void VID_Restart_f(void) return; Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp%s%s, to %s %dx%dx%dbpp%s%s.\n", - vid.fullscreen ? "fullscreen" : "window", vid.width, vid.height, vid.bitsperpixel, vid.fullscreen && vid_userefreshrate.integer ? va("x%ihz", vid.refreshrate) : "", vid.samples > 1 ? va(" (%ix AA)", vid.samples) : "", - vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_fullscreen.integer && vid_userefreshrate.integer ? va("x%ihz", vid_refreshrate.integer) : "", vid_samples.integer > 1 ? va(" (%ix AA)", vid_samples.integer) : ""); + vid.mode.fullscreen ? "fullscreen" : "window", vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.fullscreen && vid.mode.userefreshrate ? va("x%.2fhz", vid.mode.refreshrate) : "", vid.mode.samples > 1 ? va(" (%ix AA)", vid.mode.samples) : "", + vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_fullscreen.integer && vid_userefreshrate.integer ? va("x%.2fhz", vid_refreshrate.value) : "", vid_samples.integer > 1 ? va(" (%ix AA)", vid_samples.integer) : ""); VID_CloseSystems(); VID_Shutdown(); - if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer, vid_samples.integer)) + if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, vid_stereobuffer.integer, vid_samples.integer)) { Con_Print("Video mode change failed\n"); - if (!VID_Mode(vid.fullscreen, vid.width, vid.height, vid.bitsperpixel, vid.refreshrate, vid.stereobuffer, vid.samples)) + if (!VID_Mode(vid.mode.fullscreen, vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.refreshrate, vid.mode.stereobuffer, vid.mode.samples)) Sys_Error("Unable to restore to last working video mode"); } VID_OpenSystems(); @@ -1252,14 +1363,14 @@ void VID_Start(void) Cvar_SetQuick(&vid_bitsperpixel, com_argv[i+1]); } - success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer, vid_samples.integer); + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, vid_stereobuffer.integer, vid_samples.integer); if (!success) { Con_Print("Desired video mode fail, trying fallbacks...\n"); for (i = 0;!success && vidfallbacks[i][0] != NULL;i++) { Cvar_Set(vidfallbacks[i][0], vidfallbacks[i][1]); - success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.integer, vid_stereobuffer.integer, vid_samples.integer); + success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, vid_stereobuffer.integer, vid_samples.integer); } if (!success) Sys_Error("Video modes failed"); @@ -1267,7 +1378,7 @@ void VID_Start(void) VID_OpenSystems(); } -int VID_SortModes_Compare(void *a_, void *b_) +int VID_SortModes_Compare(const void *a_, const void *b_) { vid_mode_t *a = (vid_mode_t *) a_; vid_mode_t *b = (vid_mode_t *) b_; @@ -1297,26 +1408,31 @@ size_t VID_SortModes(vid_mode_t *modes, size_t count, qboolean usebpp, qboolean { size_t i; if(count == 0) - return; + return 0; // 1. sort them qsort(modes, count, sizeof(*modes), VID_SortModes_Compare); // 2. remove duplicates - for(i = 1; i < count; ++i) + for(i = 0; i < count; ++i) { - if(modes[i].width != modes[i-1].width) - continue; - if(modes[i].height != modes[i-1].height) - continue; - if(userefreshrate) - if(modes[i].refreshrate != modes[i-1].refreshrate) + if(modes[i].width && modes[i].height) + { + if(i == 0) continue; - if(usebpp) - if(modes[i].bpp != modes[i-1].bpp) + if(modes[i].width != modes[i-1].width) continue; - if(useaspect) - if(modes[i].pixelheight_num * modes[i-1].pixelheight_denom != modes[i].pixelheight_denom * modes[i-1].pixelheight_num) + if(modes[i].height != modes[i-1].height) continue; - // a dupe! + if(userefreshrate) + if(modes[i].refreshrate != modes[i-1].refreshrate) + continue; + if(usebpp) + if(modes[i].bpp != modes[i-1].bpp) + continue; + if(useaspect) + if(modes[i].pixelheight_num * modes[i-1].pixelheight_denom != modes[i].pixelheight_denom * modes[i-1].pixelheight_num) + continue; + } + // a dupe, or a bogus mode! if(i < count-1) memmove(&modes[i], &modes[i+1], sizeof(*modes) * (count-1 - i)); --i; // check this index again, as mode i+1 is now here