fix compile on non-Windows

remove header dependency
This commit is contained in:
Chris Danford
2005-11-10 20:39:55 +00:00
parent 20b5c41f76
commit db7a6af95c
6 changed files with 22 additions and 22 deletions
@@ -49,7 +49,7 @@ void *LowLevelWindow_SDL::GetProcAddress(CString s)
return SDL_GL_GetProcAddress(s);
}
CString LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut )
CString LowLevelWindow_SDL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
{
bool wasWindowed = CurrentParams.windowed;
@@ -9,14 +9,14 @@ public:
LowLevelWindow_SDL();
~LowLevelWindow_SDL();
void *GetProcAddress(CString s);
CString TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut );
CString TryVideoMode( VideoModeParams p, bool &bNewDeviceOut );
void SwapBuffers();
void Update();
RageDisplay::VideoModeParams GetVideoModeParams() const { return CurrentParams; }
VideoModeParams GetVideoModeParams() const { return CurrentParams; }
private:
RageDisplay::VideoModeParams CurrentParams;
VideoModeParams CurrentParams;
};
#ifdef ARCH_LOW_LEVEL_WINDOW
@@ -39,7 +39,7 @@ void *LowLevelWindow_X11::GetProcAddress( CString s )
return (void*) glXGetProcAddressARB( (const GLubyte*) s.c_str() );
}
CString LowLevelWindow_X11::TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut )
CString LowLevelWindow_X11::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
{
#if defined(LINUX)
/* nVidia cards:
@@ -12,14 +12,14 @@ public:
~LowLevelWindow_X11();
void *GetProcAddress(CString s);
CString TryVideoMode(RageDisplay::VideoModeParams p, bool &bNewDeviceOut);
CString TryVideoMode(VideoModeParams p, bool &bNewDeviceOut);
void SwapBuffers();
RageDisplay::VideoModeParams GetVideoModeParams() const { return CurrentParams; }
VideoModeParams GetVideoModeParams() const { return CurrentParams; }
private:
bool m_bWindowIsOpen;
RageDisplay::VideoModeParams CurrentParams;
VideoModeParams CurrentParams;
};
#ifdef ARCH_LOW_LEVEL_WINDOW
@@ -7,18 +7,18 @@
static const CString g_sClassName = CString(PRODUCT_NAME) + " LowLevelWindow_Win32";
static RageDisplay::VideoModeParams g_CurrentParams;
static VideoModeParams g_CurrentParams;
static bool g_bResolutionChanged = false;
static bool g_bHasFocus = true;
static bool g_bLastHasFocus = true;
static bool m_bWideWindowClass;
void GraphicsWindow::SetVideoModeParams( const RageDisplay::VideoModeParams &p )
void GraphicsWindow::SetVideoModeParams( const VideoModeParams &p )
{
g_CurrentParams = p;
}
RageDisplay::VideoModeParams GraphicsWindow::GetParams()
VideoModeParams GraphicsWindow::GetParams()
{
return g_CurrentParams;
}
@@ -35,11 +35,11 @@ void GraphicsWindow::Update()
void GraphicsWindow::Initialize() { }
void GraphicsWindow::Shutdown() { }
CString GraphicsWindow::SetScreenMode( const RageDisplay::VideoModeParams &p ) { return ""; }
void GraphicsWindow::CreateGraphicsWindow( const RageDisplay::VideoModeParams &p ) { }
void GraphicsWindow::RecreateGraphicsWindow( const RageDisplay::VideoModeParams &p ) { }
CString GraphicsWindow::SetScreenMode( const VideoModeParams &p ) { return ""; }
void GraphicsWindow::CreateGraphicsWindow( const VideoModeParams &p ) { }
void GraphicsWindow::RecreateGraphicsWindow( const VideoModeParams &p ) { }
void GraphicsWindow::DestroyGraphicsWindow() { }
void GraphicsWindow::ConfigureGraphicsWindow( const RageDisplay::VideoModeParams &p ) { }
void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p ) { }
/*
* (c) 2004 Glenn Maynard
@@ -4,19 +4,19 @@
#pragma once
#include "RageDisplay.h" // for RageDisplay::VideoModeParams
struct "RageDisplay.h"
namespace GraphicsWindow
{
void Initialize();
void Shutdown();
void SetVideoModeParams( const RageDisplay::VideoModeParams &p );
CString SetScreenMode( const RageDisplay::VideoModeParams &p );
void CreateGraphicsWindow( const RageDisplay::VideoModeParams &p );
void RecreateGraphicsWindow( const RageDisplay::VideoModeParams &p );
void SetVideoModeParams( const VideoModeParams &p );
CString SetScreenMode( const VideoModeParams &p );
void CreateGraphicsWindow( const VideoModeParams &p );
void RecreateGraphicsWindow( const VideoModeParams &p );
void DestroyGraphicsWindow();
void ConfigureGraphicsWindow( const RageDisplay::VideoModeParams &p );
RageDisplay::VideoModeParams GetParams();
void ConfigureGraphicsWindow( const VideoModeParams &p );
VideoModeParams GetParams();
void Update();
};