Linux+OpenGL: Implement GUI vsync setting (#477)

cemu-project · Nov 13, 2022 · e9d10a9 · e9d10a9
1 parent 2842615
commit e9d10a9
Show file tree

Hide file tree

Showing 6 changed files with 391 additions and 19 deletions.
diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp
@@ -25,8 +25,10 @@
 #define STRINGIFY(X) STRINGIFY2(X)
 
 #define GLFUNC(__type, __name)	__type __name;
+#define EGLFUNC(__type, __name)	__type __name;
 #include "Common/GLInclude/glFunctions.h"
 #undef GLFUNC
+#undef EGLFUNC
 
 #include "config/ActiveSettings.h"
 #include "config/LaunchSettings.h"
@@ -229,9 +231,17 @@ void LoadOpenGLImports()
 		_glXGetProcAddress = (PFNGLXGETPROCADDRESSPROC)dlsym(libGL, "glXGetProcAddressARB");
 	}
 
+	void* libEGL = dlopen("libEGL.so.1", RTLD_NOW | RTLD_GLOBAL);
+	if(!libEGL)
+	{
+		libGL = dlopen("libEGL.so", RTLD_NOW | RTLD_GLOBAL);
+	}
+
 #define GLFUNC(__type, __name)	__name = (__type)_GetOpenGLFunction(libGL, _glXGetProcAddress, STRINGIFY(__name));
+#define EGLFUNC(__type, __name)	__name = (__type)dlsym(libEGL, STRINGIFY(__name));
 #include "Common/GLInclude/glFunctions.h"
 #undef GLFUNC
+#undef EGLFUNC
 }
 #elif BOOST_OS_MACOS
 void LoadOpenGLImports()
@@ -352,20 +362,6 @@ void OpenGLRenderer::NotifyLatteCommandProcessorIdle()
 	glFlush();
 }
 
-void OpenGLRenderer::UpdateVSyncState()
-{
-	int configValue = GetConfig().vsync.GetValue();
-	if(m_activeVSyncState != configValue)
-	{
-#if BOOST_OS_WINDOWS
-		if(wglSwapIntervalEXT)
-			wglSwapIntervalEXT(configValue); // 1 = enabled, 0 = disabled
-#else
-		cemuLog_log(LogType::Force, "OpenGL vsync not implemented");
-#endif
-		m_activeVSyncState = configValue;
-	}
-}
 
 bool IsRunningInWine();
 
@@ -443,7 +439,6 @@ void OpenGLRenderer::EnableDebugMode()
 void OpenGLRenderer::SwapBuffers(bool swapTV, bool swapDRC)
 {
 	GLCanvas_SwapBuffers(swapTV, swapDRC);
-	UpdateVSyncState();
 
 	if (swapTV)
 		cleanupAfterFrame();

diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.h
@@ -168,7 +168,6 @@ class OpenGLRenderer : public Renderer
 	GLuint m_defaultFramebufferId;
 	GLuint m_pipeline = 0;
 
-	int m_activeVSyncState{};
 	bool m_isPadViewContext{};
 
 	// rendertarget viewport

diff --git a/src/Common/GLInclude/GLInclude.h b/src/Common/GLInclude/GLInclude.h
@@ -24,6 +24,9 @@ typedef XID GLXFBConfigID;
 typedef struct __GLXcontextRec *GLXContext;
 typedef struct __GLXFBConfigRec *GLXFBConfig;
 
+#define EGL_EGL_PROTOTYPES 0
+#include "egl.h"
+#undef EGL_EGL_PROTOTYPES
 #include "glxext.h"
 
 #undef Bool
@@ -34,9 +37,11 @@ typedef struct __GLXFBConfigRec *GLXFBConfig;
 #endif
 
 #define GLFUNC(__type, __name)	extern __type __name;
+#define EGLFUNC(__type, __name) extern __type __name;
 #include "glFunctions.h"
 #undef GLFUNC
+#undef EGLFUNC
 
 // this prevents Windows GL.h from being included:
 #define __gl_h_
-#define __GL_H__
+#define __GL_H__