Skip to content
Permalink
Browse files

x11: Let apps specify that video init should fail if XRandR is unavai…

…lable.

Notably: it sets the error string to inform you that your custom SDL is built
without xrandr support, which apparently has been a support issue for
Unreal Engine 4 developers.
  • Loading branch information
icculus committed Jan 5, 2016
1 parent f9d478b commit 81209acbd8bd7c492a558b1234ac7b58165d2ae3
Showing with 14 additions and 0 deletions.
  1. +14 −0 src/video/x11/SDL_x11modes.c
@@ -618,6 +618,20 @@ X11_InitModes(_THIS)

/* !!! FIXME: eventually remove support for Xinerama and XVidMode (everything below here). */

/* This is a workaround for some apps (UnrealEngine4, for example) until
we sort out the ramifications of removing XVidMode support outright.
This block should be removed with the XVidMode support. */
{
const char *env = SDL_GetHint("SDL_VIDEO_X11_REQUIRE_XRANDR");
if (env && SDL_atoi(env)) {
#if SDL_VIDEO_DRIVER_X11_XRANDR
return SDL_SetError("XRandR support is required but not available");
#else
return SDL_SetError("XRandR support is required but not built into SDL!");
#endif
}
}

#if SDL_VIDEO_DRIVER_X11_XINERAMA
/* Query Xinerama extention
* NOTE: This works with Nvidia Twinview correctly, but you need version 302.17 (released on June 2012)

0 comments on commit 81209ac

Please sign in to comment.