return false;
}
+#ifndef USE_GLES2
for (func = openglfuncs; func && func->name != NULL; func++)
{
if (!*func->funcvariable && !strcmp(name, func->extension))
failed = true;
}
}
+#endif //USE_GLES2
// delay the return so it prints all missing functions
if (failed)
return false;
void GL_Setup(void)
{
char *s;
+ int j;
+ GLint numextensions = 0;
const glfunction_t *func;
qboolean missingrequiredfuncs = false;
static char missingfuncs[16384];
Con_Printf("GL_RENDERER: %s\n", gl_renderer);
Con_Printf("GL_VERSION: %s\n", gl_version);
- if (developer.integer)
+#ifndef USE_GLES2
+ qglGetIntegerv(GL_NUM_EXTENSIONS, &numextensions);
+ Con_DPrint("GL_EXTENSIONS:\n");
+ for (j = 0; j < numextensions; j++)
{
- int j;
- GLint numextensions = 0;
- qglGetIntegerv(GL_NUM_EXTENSIONS, &numextensions);
- Con_DPrint("GL_EXTENSIONS:");
- for (j = 0; j < numextensions; j++)
- {
- const char *ext = (const char *)qglGetStringi(GL_EXTENSIONS, j);
- Con_DPrintf(" %s", ext);
- }
- Con_DPrint("\n");
+ const char *ext = (const char *)qglGetStringi(GL_EXTENSIONS, j);
+ Con_DPrintf(" %s", ext);
+ if(j && !(j % 3))
+ Con_DPrintf("\n");
}
+ Con_DPrint("\n");
+#endif //USE_GLES2
#ifndef USE_GLES2
missingfuncs[0] = 0;
vid.support.glshaderversion = (int)(atof(s) * 100.0f + 0.5f);
if (vid.support.glshaderversion < 100)
vid.support.glshaderversion = 100;
- Con_DPrintf("Detected GLSL #version %i\n", vid.support.glshaderversion);
+ Con_Printf("Detected GLSL version %i\n", vid.support.glshaderversion);
#ifdef USE_GLES2
// GLES devices in general do not like GL_BGRA, so use GL_RGBA
CHECKGLERROR
#ifdef USE_GLES2
- Con_DPrint("Using GLES2 rendering path\n");
+ Con_Print("Using GLES2 rendering path\n");
vid.renderpath = RENDERPATH_GLES2;
vid.sRGBcapable2D = false;
vid.sRGBcapable3D = false;
#else
- Con_DPrint("Using GL32 rendering path\n");
+ Con_Print("Using GL32 rendering path\n");
vid.renderpath = RENDERPATH_GL32;
vid.sRGBcapable2D = false;
vid.sRGBcapable3D = true;
Cmd_AddCommand(CMD_CLIENT, "vid_restart", VID_Restart_f, "restarts video system (closes and reopens the window, restarts renderer)");
}
-static int VID_Mode(int fullscreen, int width, int height, int bpp, float refreshrate, int stereobuffer, int samples)
+static int VID_Mode(int fullscreen, int width, int height, int bpp, float refreshrate, int stereobuffer)
{
viddef_mode_t mode;
- char vabuf[1024];
memset(&mode, 0, sizeof(mode));
mode.fullscreen = fullscreen != 0;
mode.refreshrate = vid_userefreshrate.integer ? max(1, refreshrate) : 0;
mode.userefreshrate = vid_userefreshrate.integer != 0;
mode.stereobuffer = stereobuffer != 0;
- mode.samples = samples;
cl_ignoremousemoves = 2;
VID_ClearExtensions();
- vid.samples = vid.mode.samples;
if (VID_InitMode(&mode))
{
// accept the (possibly modified) mode
)
vid.sRGB2D = vid.sRGB3D = false;
- if(vid.samples != vid.mode.samples)
- Con_Printf("NOTE: requested %dx AA, got %dx AA\n", vid.mode.samples, vid.samples);
-
- 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(vabuf, sizeof(vabuf), " (%ix AA)", mode.samples) : "");
+ Con_Printf("Video Mode: %s %dx%dx%dx%.2fhz%s\n", mode.fullscreen ? "fullscreen" : "window", mode.width, mode.height, mode.bitsperpixel, mode.refreshrate, mode.stereobuffer ? " stereo" : "");
Cvar_SetValueQuick(&vid_fullscreen, vid.mode.fullscreen);
Cvar_SetValueQuick(&vid_width, vid.mode.width);
void VID_Restart_f(cmd_state_t *cmd)
{
char vabuf[1024];
- char vabuf2[1024];
+
// don't crash if video hasn't started yet
if (vid_commandlinecheck)
return;
return;
}
- Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp%s%s, to %s %dx%dx%dbpp%s%s.\n",
- vid.mode.fullscreen ? "fullscreen" : "window", vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.fullscreen && vid.mode.userefreshrate ? va(vabuf, sizeof(vabuf), "x%.2fhz", vid.mode.refreshrate) : "", vid.mode.samples > 1 ? va(vabuf2, sizeof(vabuf2), " (%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(vabuf, sizeof(vabuf), "x%.2fhz", vid_refreshrate.value) : "", vid_samples.integer > 1 ? va(vabuf2, sizeof(vabuf2), " (%ix AA)", vid_samples.integer) : "");
+ Con_Printf("VID_Restart: changing from %s %dx%dx%dbpp%s, to %s %dx%dx%dbpp%s.\n",
+ vid.mode.fullscreen ? "fullscreen" : "window", vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.fullscreen && vid.mode.userefreshrate ? va(vabuf, sizeof(vabuf), "x%.2fhz", vid.mode.refreshrate) : "",
+ vid_fullscreen.integer ? "fullscreen" : "window", vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_fullscreen.integer && vid_userefreshrate.integer ? va(vabuf, sizeof(vabuf), "x%.2fhz", vid_refreshrate.value) : "");
VID_CloseSystems();
VID_Shutdown();
- if (!VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, 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))
{
Con_Print("Video mode change failed\n");
- if (!VID_Mode(vid.mode.fullscreen, vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.refreshrate, vid.mode.stereobuffer, vid.mode.samples))
+ if (!VID_Mode(vid.mode.fullscreen, vid.mode.width, vid.mode.height, vid.mode.bitsperpixel, vid.mode.refreshrate, vid.mode.stereobuffer))
Sys_Error("Unable to restore to last working video mode");
}
VID_OpenSystems();
// interpret command-line parameters
vid_commandlinecheck = false;
// COMMANDLINEOPTION: Video: -window performs +vid_fullscreen 0
- if (COM_CheckParm("-window") || COM_CheckParm("-safe") || (i = COM_CheckParm("+vid_fullscreen") != 0 && atoi(sys.argv[i+1]) == 0))
+ if (COM_CheckParm("-window") || COM_CheckParm("-safe") || ((i = COM_CheckParm("+vid_fullscreen")) != 0 && atoi(sys.argv[i+1]) == 0))
Cvar_SetValueQuick(&vid_fullscreen, false);
// COMMANDLINEOPTION: Video: -borderless performs +vid_borderless 1
- if (COM_CheckParm("-borderless") || (i = COM_CheckParm("+vid_borderless") != 0 && atoi(sys.argv[i+1]) == 1))
+ if (COM_CheckParm("-borderless") || ((i = COM_CheckParm("+vid_borderless")) != 0 && atoi(sys.argv[i+1]) == 1))
{
Cvar_SetValueQuick(&vid_borderless, true);
Cvar_SetValueQuick(&vid_fullscreen, false);
}
// COMMANDLINEOPTION: Video: -fullscreen performs +vid_fullscreen 1
- if (COM_CheckParm("-fullscreen") || (i = COM_CheckParm("+vid_fullscreen") != 0 && atoi(sys.argv[i+1]) == 1))
+ if (COM_CheckParm("-fullscreen") || ((i = COM_CheckParm("+vid_fullscreen")) != 0 && atoi(sys.argv[i+1]) == 1))
Cvar_SetValueQuick(&vid_fullscreen, true);
width = 0;
height = 0;
// COMMANDLINEOPTION: Video: -width <pixels> performs +vid_width <pixels> and also +vid_height <pixels*3/4> if only -width is specified (example: -width 1024 sets 1024x768 mode)
- if ((i = COM_CheckParm("-width")) != 0 || (i = COM_CheckParm("+vid_width") != 0))
+ if ((i = COM_CheckParm("-width")) != 0 || ((i = COM_CheckParm("+vid_width")) != 0))
width = atoi(sys.argv[i+1]);
// COMMANDLINEOPTION: Video: -height <pixels> performs +vid_height <pixels> and also +vid_width <pixels*4/3> if only -height is specified (example: -height 768 sets 1024x768 mode)
- if ((i = COM_CheckParm("-height")) != 0 || (i = COM_CheckParm("+vid_height") != 0))
+ if ((i = COM_CheckParm("-height")) != 0 || ((i = COM_CheckParm("+vid_height")) != 0))
height = atoi(sys.argv[i+1]);
if (width == 0)
width = height * 4 / 3;
Cvar_SetQuick(&vid_touchscreen_ydpi, sys.argv[i+1]);
}
- success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, 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);
if (!success)
{
Con_Print("Desired video mode fail, trying fallbacks...\n");
for (i = 0;!success && vidfallbacks[i][0] != NULL;i++)
{
Cvar_Set(&cvars_all, vidfallbacks[i][0], vidfallbacks[i][1]);
- success = VID_Mode(vid_fullscreen.integer, vid_width.integer, vid_height.integer, vid_bitsperpixel.integer, vid_refreshrate.value, 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);
}
if (!success)
Sys_Error("Video modes failed");
projects / xonotic / darkplaces.git / blobdiff