mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 12:35:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename our GLInterface class function 'GetProcAddress' in order to not have clashing function names due to Windows.

Browse Source
This commit is contained in:
Ryan Houdek 2014-01-18 14:18:32 +00:00
parent bea484e12f
commit 5d26bf6d9d
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/GLInterface/EGL.cpp
View File

@ -35,7 +35,7 @@ void cInterfaceEGL::SwapInterval(int Interval)
eglSwapInterval(GLWin.egl_dpy, Interval);
}
void* cInterfaceEGL::GetProcAddress(std::string name)
void* cInterfaceEGL::GetFuncAddress(std::string name)
{
return (void*)eglGetProcAddress(name.c_str());
}

2
Source/Core/DolphinWX/GLInterface/EGL.h
View File

@ -33,7 +33,7 @@ public:
void Swap();
void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_DETECT; }
void UpdateFPSDisplay(const char *Text);
void* GetProcAddress(std::string name);
void* GetFuncAddress(std::string name);
bool Create(void *&window_handle);
bool MakeCurrent();
void Shutdown();

4
Source/Core/DolphinWX/GLInterface/GLX.cpp
View File

@ -38,7 +38,7 @@ void cInterfaceGLX::SwapInterval(int Interval)
else
ERROR_LOG(VIDEO, "No support for SwapInterval (framerate clamped to monitor refresh rate).");
}
void* cInterfaceGLX::GetProcAddress(std::string name)
void* cInterfaceGLX::GetFuncAddress(std::string name)
{
return (void*)glXGetProcAddress((const GLubyte*)name.c_str());
}
@ -123,7 +123,7 @@ bool cInterfaceGLX::Create(void *&window_handle)
PanicAlert("Unable to create GLX context.");
return false;
}
glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)GLInterface->GetProcAddress("glXSwapIntervalSGI");
glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)GLInterface->GetFuncAddress("glXSwapIntervalSGI");
GLWin.x = _tx;
GLWin.y = _ty;

2
Source/Core/DolphinWX/GLInterface/GLX.h
View File

@ -29,7 +29,7 @@ public:
void SwapInterval(int Interval);
void Swap();
void UpdateFPSDisplay(const char *Text);
void* GetProcAddress(std::string name);
void* GetFuncAddress(std::string name);
bool Create(void *&window_handle);
bool MakeCurrent();
bool ClearCurrent();

2
Source/Core/DolphinWX/GLInterface/InterfaceBase.h
View File

@ -24,7 +24,7 @@ public:
virtual void UpdateFPSDisplay(const char *Text) {}
virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
virtual u32 GetMode() { return s_opengl_mode; }
virtual void* GetProcAddress(std::string name) { return NULL; }
virtual void* GetFuncAddress(std::string name) { return NULL; }
virtual bool Create(void *&window_handle) { return true; }
virtual bool MakeCurrent() { return true; }
virtual bool ClearCurrent() { return true; }

4
Source/Core/DolphinWX/GLInterface/WGL.cpp
View File

@ -31,7 +31,7 @@ void cInterfaceWGL::Swap()
SwapBuffers(hDC);
}
void* cInterfaceWGL::GetProcAddress(std::string name)
void* cInterfaceWGL::GetFuncAddress(std::string name)
{
void* func = (void*)wglGetProcAddress((LPCSTR)name.c_str());
if (func == NULL)
@ -83,7 +83,7 @@ bool cInterfaceWGL::Create(void *&window_handle)
Host_SysMessage("failed to create window");
return false;
}
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)GLInterface->GetProcAddress("wglSwapIntervalEXT");
wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)GLInterface->GetFuncAddress("wglSwapIntervalEXT");
// Show the window
EmuWindow::Show();

2
Source/Core/DolphinWX/GLInterface/WGL.h
View File

@ -13,7 +13,7 @@ public:
void SwapInterval(int Interval);
void Swap();
void UpdateFPSDisplay(const char *Text);
void* GetProcAddress(std::string name);
void* GetFuncAddress(std::string name);
bool Create(void *&window_handle);
bool MakeCurrent();
bool ClearCurrent();

2
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -942,7 +942,7 @@ namespace GLExtensions
void* GetFuncAddress(std::string name, void **func)
{
*func = GLInterface->GetProcAddress(name);
*func = GLInterface->GetFuncAddress(name);
if (*func == NULL)
{
#if defined(__linux__) || defined(__APPLE__)