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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-14 23:59:14 +00:00
parent e91d77f6aa
commit 1dfafc21da
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+6 -11
View File
@@ -324,12 +324,7 @@ static void TurnOffHardwareVBO()
} }
} }
#if defined(UNIX)
#if defined(__unix__) && !defined(unix)
#define unix
#endif
#if defined(unix)
#define Font X11___Font #define Font X11___Font
#define Screen X11___Screen #define Screen X11___Screen
#include "GL/glx.h" #include "GL/glx.h"
@@ -337,13 +332,13 @@ static void TurnOffHardwareVBO()
#undef Screen #undef Screen
#endif #endif
#if defined(unix) #if defined(UNIX)
Display *g_X11Display = NULL; Display *g_X11Display = NULL;
#endif #endif
static void LogGLXDebugInformation() static void LogGLXDebugInformation()
{ {
#if defined(unix) #if defined(UNIX)
ASSERT( g_X11Display ); ASSERT( g_X11Display );
const int scr = DefaultScreen( g_X11Display ); const int scr = DefaultScreen( g_X11Display );
@@ -415,7 +410,7 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
} }
#endif #endif
#if defined(unix) #if defined(UNIX)
if( !glXIsDirect( g_X11Display, glXGetCurrentContext() ) ) if( !glXIsDirect( g_X11Display, glXGetCurrentContext() ) )
{ {
if( !bAllowUnacceleratedRenderer ) if( !bAllowUnacceleratedRenderer )
@@ -437,7 +432,7 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
glGetFloatv(GL_POINT_SIZE_GRANULARITY, &g_point_granularity); glGetFloatv(GL_POINT_SIZE_GRANULARITY, &g_point_granularity);
} }
#if defined(unix) && defined(HAVE_LIBXTST) #if defined(UNIX) && defined(HAVE_LIBXTST)
#include <X11/extensions/XTest.h> #include <X11/extensions/XTest.h>
#endif #endif
@@ -448,7 +443,7 @@ void RageDisplay_OGL::Update(float fDeltaTime)
if( PREFSMAN->m_bDisableScreenSaver ) if( PREFSMAN->m_bDisableScreenSaver )
{ {
/* Disable the screensaver. */ /* Disable the screensaver. */
#if defined(unix) && defined(HAVE_LIBXTST) #if defined(UNIX) && defined(HAVE_LIBXTST)
ASSERT( g_X11Display ); ASSERT( g_X11Display );
/* This causes flicker. */ /* This causes flicker. */