piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

more osx64 work

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@963 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
tmator
2008-10-25 17:47:46 +00:00
parent d3da9a67d7
commit 8f3aa9e67b
11 changed files with 300 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -63,6 +63,8 @@ void OpenGL_SwapBuffers()
{
#if USE_SDL
SDL_GL_SwapBuffers();
#elif defined(OSX64)
#elif defined(_WIN32)
SwapBuffers(hDC);
#else // GLX
@ -74,6 +76,8 @@ void OpenGL_SetWindowText(const char *text)
{
#if USE_SDL
SDL_WM_SetCaption(text, NULL);
#elif defined(OSX64)
#elif defined(_WIN32)
SetWindowText(EmuWindow::GetWnd(), text);
#else // GLX
@ -85,13 +89,19 @@ void OpenGL_SetWindowText(const char *text)
#endif
}
#if defined(OSX64)
unsigned int Callback_PeekMessages()
#else
BOOL Callback_PeekMessages()
#endif
{
#if USE_SDL
// TODO: There is no documentation of this function and the calling code
// ignores the return value, so I have no idea what would be the
// proper value to return.
return FALSE;
#elif defined(OSX64)
return FALSE;
#elif defined(_WIN32)
//TODO: peekmessage
MSG msg;
@ -199,6 +209,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
//setup ogl to use double buffering
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
#elif defined(OSX64)
#elif defined(_WIN32)
// create the window
@ -479,6 +490,8 @@ bool OpenGL_MakeCurrent()
SDL_Quit();
return false;
}
#elif defined(OSX64)
#elif defined(_WIN32)
if (!wglMakeCurrent(hDC,hRC)) {
MessageBox(NULL,"(5) Can't Activate The GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION);
@ -515,6 +528,8 @@ void OpenGL_Update()
if (!surface) return;
nBackbufferWidth = surface->w;
nBackbufferHeight = surface->h;
#elif defined(OSX64)
RECT rcWindow;
#elif defined(_WIN32)
if (!EmuWindow::GetParentWnd()) return;
@ -650,6 +665,8 @@ void OpenGL_Shutdown()
{
#if USE_SDL
SDL_Quit();
#elif defined(OSX64)
#elif defined(_WIN32)
if (hRC) // Do We Have A Rendering Context?
{