First Commit
This commit is contained in:
48
debian/patches/fix-build-glew-egl.patch
vendored
Normal file
48
debian/patches/fix-build-glew-egl.patch
vendored
Normal file
@@ -0,0 +1,48 @@
|
||||
diff --git a/rpcs3/Emu/RSX/GL/OpenGL.cpp b/rpcs3/Emu/RSX/GL/OpenGL.cpp
|
||||
index 78241f557..252729104 100644
|
||||
--- a/rpcs3/Emu/RSX/GL/OpenGL.cpp
|
||||
+++ b/rpcs3/Emu/RSX/GL/OpenGL.cpp
|
||||
@@ -1,7 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "OpenGL.h"
|
||||
|
||||
-#if defined(HAVE_WAYLAND)
|
||||
+#if defined(HAVE_X11) || defined(HAVE_WAYLAND)
|
||||
#include <EGL/egl.h>
|
||||
#endif
|
||||
|
||||
@@ -38,9 +38,6 @@ void gl::init()
|
||||
#ifdef __unix__
|
||||
glewExperimental = true;
|
||||
glewInit();
|
||||
-#ifdef HAVE_X11
|
||||
- glxewInit();
|
||||
-#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -48,23 +45,12 @@ void gl::set_swapinterval(int interval)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
wglSwapIntervalEXT(interval);
|
||||
-#elif defined(HAVE_X11)
|
||||
- if (glXSwapIntervalEXT)
|
||||
- {
|
||||
- if (auto window = glXGetCurrentDrawable())
|
||||
- {
|
||||
- glXSwapIntervalEXT(glXGetCurrentDisplay(), window, interval);
|
||||
- return;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
-#ifdef HAVE_WAYLAND
|
||||
+#elif defined(HAVE_X11) || defined(HAVE_WAYLAND)
|
||||
if (auto egl_display = eglGetCurrentDisplay(); egl_display != EGL_NO_DISPLAY)
|
||||
{
|
||||
eglSwapInterval(egl_display, interval);
|
||||
return;
|
||||
}
|
||||
-#endif
|
||||
|
||||
//No existing drawable or missing swap extension, EGL?
|
||||
rsx_log.error("Failed to set swap interval");
|
||||
Reference in New Issue
Block a user