diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 3ba42d8bb5..0f9328897b 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -296,28 +296,6 @@ static void TurnOffHardwareVBO() Display *g_X11Display = NULL; #endif -static void LogGLXDebugInformation() -{ -#if defined(UNIX) - ASSERT( g_X11Display ); - - const int scr = DefaultScreen( g_X11Display ); - - LOG->Info( "Display: %s (screen %i)", DisplayString(g_X11Display), scr ); - LOG->Info( "Direct rendering: %s", glXIsDirect( g_X11Display, glXGetCurrentContext() )? "yes":"no" ); - - int XServerVersion = XVendorRelease( g_X11Display ); /* eg. 40201001 */ - int major = XServerVersion / 10000000; XServerVersion %= 10000000; - int minor = XServerVersion / 100000; XServerVersion %= 100000; - int revision = XServerVersion / 1000; XServerVersion %= 1000; - int patch = XServerVersion; - - LOG->Info( "X server vendor: %s [%i.%i.%i.%i]", XServerVendor( g_X11Display ), major, minor, revision, patch ); - LOG->Info( "Server GLX vendor: %s [%s]", glXQueryServerString( g_X11Display, scr, GLX_VENDOR ), glXQueryServerString( g_X11Display, scr, GLX_VERSION ) ); - LOG->Info( "Client GLX vendor: %s [%s]", glXGetClientString( g_X11Display, GLX_VENDOR ), glXGetClientString( g_X11Display, GLX_VERSION ) ); -#endif -} - RageDisplay_OGL::RageDisplay_OGL() { LOG->Trace( "RageDisplay_OGL::RageDisplay_OGL()" ); @@ -440,8 +418,6 @@ CString RageDisplay_OGL::Init( VideoModeParams p, bool bAllowUnacceleratedRender LOG->Info( "OGL Extensions: %s", glGetString(GL_EXTENSIONS) ); LOG->Info( "GLU Version: %s", gluGetString(GLU_VERSION) ); - LogGLXDebugInformation(); - if( IsSoftwareRenderer() ) { if( !bAllowUnacceleratedRenderer ) diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp index 4d79779ba9..0e49db96b9 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp @@ -21,6 +21,21 @@ LowLevelWindow_X11::LowLevelWindow_X11() RageException::Throw( "Failed to establish a connection with the X server." ); } g_X11Display = X11Helper::Dpy; + + const int iScreen = DefaultScreen( g_X11Display ); + + LOG->Info( "Display: %s (screen %i)", DisplayString(g_X11Display), iScreen ); + LOG->Info( "Direct rendering: %s", glXIsDirect( g_X11Display, glXGetCurrentContext() )? "yes":"no" ); + + int iXServerVersion = XVendorRelease( g_X11Display ); /* eg. 40201001 */ + int iMajor = iXServerVersion / 10000000; iXServerVersion %= 10000000; + int iMinor = iXServerVersion / 100000; iXServerVersion %= 100000; + int iRevision = iXServerVersion / 1000; iXServerVersion %= 1000; + int iPatch = iXServerVersion; + + LOG->Info( "X server vendor: %s [%i.%i.%i.%i]", XServerVendor( g_X11Display ), iMajor, iMinor, iRevision, iPatch ); + LOG->Info( "Server GLX vendor: %s [%s]", glXQueryServerString( g_X11Display, iScreen, GLX_VENDOR ), glXQueryServerString( g_X11Display, iScreen, GLX_VERSION ) ); + LOG->Info( "Client GLX vendor: %s [%s]", glXGetClientString( g_X11Display, GLX_VENDOR ), glXGetClientString( g_X11Display, GLX_VERSION ) ); } LowLevelWindow_X11::~LowLevelWindow_X11()