diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 278c073f83..6e66e72289 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -604,14 +604,7 @@ void GLGSRender::OnInitThread() glEnable(GL_TEXTURE_2D); 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); -#endif } void GLGSRender::OnExitThread() diff --git a/rpcs3/Emu/GS/GL/OpenGL.cpp b/rpcs3/Emu/GS/GL/OpenGL.cpp index e1a797c216..f113c447de 100644 --- a/rpcs3/Emu/GS/GL/OpenGL.cpp +++ b/rpcs3/Emu/GS/GL/OpenGL.cpp @@ -3,13 +3,11 @@ void InitProcTable() { -#if 0 #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.") #include "GLProcTable.tbl" #undef OPENGL_PROC #undef OPENGL_PROC2 -#endif } #define OPENGL_PROC(p, n) p gl##n = nullptr @@ -31,13 +29,11 @@ OpenGL::~OpenGL() void OpenGL::Init() { -#if 0 #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.") #include "GLProcTable.tbl" #undef OPENGL_PROC #undef OPENGL_PROC2 -#endif } void OpenGL::Close() diff --git a/rpcs3/Emu/GS/GL/OpenGL.h b/rpcs3/Emu/GS/GL/OpenGL.h index 83859fd75b..624d706315 100644 --- a/rpcs3/Emu/GS/GL/OpenGL.h +++ b/rpcs3/Emu/GS/GL/OpenGL.h @@ -2,13 +2,7 @@ #include #include "GL/glext.h" -#ifdef __GNUG__ // HACK: detect xorg -#define GLX_GLXEXT_PROTOTYPES -//#include -//#include -#else typedef BOOL (WINAPI* PFNWGLSWAPINTERVALEXTPROC) (int interval); -#endif #define OPENGL_PROC(p, n) extern p gl##n #define OPENGL_PROC2(p, n, tn) OPENGL_PROC(p, n)