Kaydet (Commit) 1bf5639c authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Fix mac build: explicitly check all platforms inside swapBuffers

Plus some cosmetics

Change-Id: I42d989217a0b40a8a6a03c0ebc6c4aa14b34d387
üst e112ac81
...@@ -586,7 +586,7 @@ bool OpenGLContext::initWindow() ...@@ -586,7 +586,7 @@ bool OpenGLContext::initWindow()
return true; return true;
} }
#elif defined( MACOSX ) || defined( IOS) || defined( ANDROID ) #elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
bool OpenGLContext::initWindow() bool OpenGLContext::initWindow()
{ {
...@@ -648,7 +648,7 @@ bool OpenGLContext::initWindow() ...@@ -648,7 +648,7 @@ bool OpenGLContext::initWindow()
#endif #endif
#if defined( WNT ) || defined( MACOSX ) || defined( IOS) || defined( ANDROID ) #if defined( WNT ) || defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
SystemWindowData OpenGLContext::generateWinData(Window* /*pParent*/) SystemWindowData OpenGLContext::generateWinData(Window* /*pParent*/)
{ {
...@@ -752,8 +752,10 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent) ...@@ -752,8 +752,10 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent)
void OpenGLContext::swapBuffers() void OpenGLContext::swapBuffers()
{ {
#if defined( _WIN32 ) #if defined( WNT )
SwapBuffers(m_aGLWin.hDC); SwapBuffers(m_aGLWin.hDC);
#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
// nothing
#elif defined( UNX ) #elif defined( UNX )
glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win); glXSwapBuffers(m_aGLWin.dpy, m_aGLWin.win);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment