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

LowLevelWindow is responsible for setting g_X11Display

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-14 05:48:28 +00:00
parent ec75189203
commit 6440ee4936
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+2 -16
View File
@@ -6,7 +6,6 @@
* time, RageDisplay.h is sufficient. * time, RageDisplay.h is sufficient.
*/ */
#include "SDL_utils.h"
/* ours is more up-to-date */ /* ours is more up-to-date */
#define NO_SDL_GLEXT #define NO_SDL_GLEXT
#define __glext_h_ /* try harder to stop glext.h from being forced on us by someone else */ #define __glext_h_ /* try harder to stop glext.h from being forced on us by someone else */
@@ -265,7 +264,7 @@ static void FixLilEndian()
{ {
RageDisplay::PixelFormatDesc &pf = PIXEL_FORMAT_DESC[i]; RageDisplay::PixelFormatDesc &pf = PIXEL_FORMAT_DESC[i];
/* OpenGL and SDL handle byte formats differently; we need /* OpenGL and RageSurface handle byte formats differently; we need
* to flip non-paletted masks to make them line up. */ * to flip non-paletted masks to make them line up. */
if( GL_PIXFMT_INFO[i].type != GL_UNSIGNED_BYTE || pf.bpp == 8 ) if( GL_PIXFMT_INFO[i].type != GL_UNSIGNED_BYTE || pf.bpp == 8 )
continue; continue;
@@ -335,7 +334,7 @@ static void TurnOffHardwareVBO()
#endif #endif
#if defined(unix) #if defined(unix)
static Display *g_X11Display = NULL; Display *g_X11Display = NULL;
#endif #endif
static void LogGLXDebugInformation() static void LogGLXDebugInformation()
@@ -773,19 +772,6 @@ CString RageDisplay_OGL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
InvalidateAllGeometry(); InvalidateAllGeometry();
} }
#if defined(unix)
{
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
g_X11Display = NULL;
if ( SDL_GetWMInfo(&info) < 0 )
LOG->Warn("SDL_GetWMInfo failed: %s", SDL_GetError());
else
g_X11Display = info.info.x11.display;
}
#endif
this->SetDefaultRenderStates(); this->SetDefaultRenderStates();
DumpOpenGLDebugInfo(); DumpOpenGLDebugInfo();