actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move some GLX-specific stuff into LowLevelWindow_X11

Browse Source
This commit is contained in:
Glenn Maynard
2005-11-13 18:43:22 +00:00
parent 7f95e0a309
commit 9c17980ed5
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
-24
View File
@@ -296,28 +296,6 @@ static void TurnOffHardwareVBO()
Display *g_X11Display = NULL; Display *g_X11Display = NULL;
#endif #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() RageDisplay_OGL::RageDisplay_OGL()
{ {
LOG->Trace( "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( "OGL Extensions: %s", glGetString(GL_EXTENSIONS) );
LOG->Info( "GLU Version: %s", gluGetString(GLU_VERSION) ); LOG->Info( "GLU Version: %s", gluGetString(GLU_VERSION) );
LogGLXDebugInformation();
if( IsSoftwareRenderer() ) if( IsSoftwareRenderer() )
{ {
if( !bAllowUnacceleratedRenderer ) if( !bAllowUnacceleratedRenderer )
stepmania/src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+15
View File
@@ -21,6 +21,21 @@ LowLevelWindow_X11::LowLevelWindow_X11()
RageException::Throw( "Failed to establish a connection with the X server." ); RageException::Throw( "Failed to establish a connection with the X server." );
} }
g_X11Display = X11Helper::Dpy; 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() LowLevelWindow_X11::~LowLevelWindow_X11()