// 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;
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);
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 *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 *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);
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)
// 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;
}
// {"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},
{"glDeleteFramebuffersEXT" , (void **) &qglDeleteFramebuffersEXT},
{"glGenFramebuffersEXT" , (void **) &qglGenFramebuffersEXT},
{"glCheckFramebufferStatusEXT" , (void **) &qglCheckFramebufferStatusEXT},
- {"glFramebufferTexture1DEXT" , (void **) &qglFramebufferTexture1DEXT},
+// {"glFramebufferTexture1DEXT" , (void **) &qglFramebufferTexture1DEXT},
{"glFramebufferTexture2DEXT" , (void **) &qglFramebufferTexture2DEXT},
{"glFramebufferTexture3DEXT" , (void **) &qglFramebufferTexture3DEXT},
{"glFramebufferRenderbufferEXT" , (void **) &qglFramebufferRenderbufferEXT},
{
{"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}
};
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
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)
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);
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 != 0;
- vid.width = width;
- vid.height = height;
- vid.bitsperpixel = bpp;
- vid.samples = samples;
- vid.refreshrate = refreshrate;
- vid.stereobuffer = stereobuffer != 0;
- vid.userefreshrate = vid_userefreshrate.integer != 0;
- 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;
}
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();
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");