mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup OpenGL hacks

Browse Source
This commit is contained in:
Mislav Blažević 2013-11-23 23:31:05 +01:00
parent d8bd34b57e
commit 2926d3805c
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/Emu/GS/GL/GLGSRender.cpp
View File

@ -604,14 +604,7 @@ void GLGSRender::OnInitThread()
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
#if defined(__GNUG__) // Hack. Should detect xorg instead
#if 0
if (GLXDrawable drawable = glXGetCurrentDrawable())
glXSwapIntervalEXT(glXGetCurrentDisplay(), drawable, Ini.GSVSyncEnable.GetValue() ? 1 : 0);
#endif
#else
glSwapInterval(Ini.GSVSyncEnable.GetValue() ? 1 : 0); glSwapInterval(Ini.GSVSyncEnable.GetValue() ? 1 : 0);
#endif
} }
void GLGSRender::OnExitThread() void GLGSRender::OnExitThread()

4
rpcs3/Emu/GS/GL/OpenGL.cpp
View File

@ -3,13 +3,11 @@
void InitProcTable() void InitProcTable()
{ {
#if 0
#define OPENGL_PROC(p, n) OPENGL_PROC2(p, n, gl##n) #define OPENGL_PROC(p, n) OPENGL_PROC2(p, n, gl##n)
#define OPENGL_PROC2(p, n, tn) /*if(!gl##n)*/ if(!(gl##n = (p)wglGetProcAddress(#tn))) ConLog.Error("OpenGL: initialization of " #tn " failed.") #define OPENGL_PROC2(p, n, tn) /*if(!gl##n)*/ if(!(gl##n = (p)wglGetProcAddress(#tn))) ConLog.Error("OpenGL: initialization of " #tn " failed.")
#include "GLProcTable.tbl" #include "GLProcTable.tbl"
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#endif
} }
#define OPENGL_PROC(p, n) p gl##n = nullptr #define OPENGL_PROC(p, n) p gl##n = nullptr
@ -31,13 +29,11 @@ OpenGL::~OpenGL()
void OpenGL::Init() void OpenGL::Init()
{ {
#if 0
#define OPENGL_PROC(p, n) OPENGL_PROC2(p, n, gl##n) #define OPENGL_PROC(p, n) OPENGL_PROC2(p, n, gl##n)
#define OPENGL_PROC2(p, n, tn) if(!(n = (p)wglGetProcAddress(#tn))) ConLog.Error("OpenGL: initialization of " #tn " failed.") #define OPENGL_PROC2(p, n, tn) if(!(n = (p)wglGetProcAddress(#tn))) ConLog.Error("OpenGL: initialization of " #tn " failed.")
#include "GLProcTable.tbl" #include "GLProcTable.tbl"
#undef OPENGL_PROC #undef OPENGL_PROC
#undef OPENGL_PROC2 #undef OPENGL_PROC2
#endif
} }
void OpenGL::Close() void OpenGL::Close()

6
rpcs3/Emu/GS/GL/OpenGL.h
View File

@ -2,13 +2,7 @@
#include <GL/gl.h> #include <GL/gl.h>
#include "GL/glext.h" #include "GL/glext.h"
#ifdef __GNUG__ // HACK: detect xorg
#define GLX_GLXEXT_PROTOTYPES
//#include <X11/Xlib.h>
//#include <GL/glxext.h>
#else
typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval); typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval);
#endif
#define OPENGL_PROC(p, n) extern p gl##n #define OPENGL_PROC(p, n) extern p gl##n
#define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n) #define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n)