Broke Windows, here's a fix.

fe1adfce · Zachary Lund · 5c3b5680 · fe1adfce · fe1adfce · fe1adfce
隐藏空白更改
内联并排

Showing with 42 addition and 3 deletion

libobs-opengl/GL/gl_obs.c libobs-opengl/GL/gl_obs.c +14 -1

libobs-opengl/GL/glx_obs.c libobs-opengl/GL/glx_obs.c +14 -1

libobs-opengl/GL/wgl_obs.c libobs-opengl/GL/wgl_obs.c +14 -1

未找到文件。
--- a/libobs-opengl/GL/gl_obs.c
+++ b/libobs-opengl/GL/gl_obs.c
@@ -26,7 +26,20 @@ static void* AppleGLGetProcAddress (const const char *name)
 #pragma warning(disable: 4996)
 #endif
 	
-#define IntGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+static PROC WinGetProcAddress(const char *name)
+{
+	static HMODULE glMod = NULL;
+	PROC pFunc = wglGetProcAddress((LPCSTR)name);
+
+	if (pFunc) return pFunc;
+
+	if (NULL == glMod)
+		glMod = GetModuleHandleA("OpenGL32.dll");
+
+	return (PROC)GetProcAddress(glMod, (LPCSTR)name);
+}
+
+#define IntGetProcAddress(name) WinGetProcAddress(name)
 #endif

 /* Linux, FreeBSD, other */

--- a/libobs-opengl/GL/glx_obs.c
+++ b/libobs-opengl/GL/glx_obs.c
@@ -26,7 +26,20 @@ static void* AppleGLGetProcAddress (const const char *name)
 #pragma warning(disable: 4996)
 #endif
 	
-#define IntGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+static PROC WinGetProcAddress(const char *name)
+{
+	static HMODULE glMod = NULL;
+	PROC pFunc = wglGetProcAddress((LPCSTR)name);
+
+	if (pFunc) return pFunc;
+
+	if (NULL == glMod)
+		glMod = GetModuleHandleA("OpenGL32.dll");
+
+	return (PROC)GetProcAddress(glMod, (LPCSTR)name);
+}
+
+#define IntGetProcAddress(name) WinGetProcAddress(name)
 #endif

 /* Linux, FreeBSD, other */

--- a/libobs-opengl/GL/wgl_obs.c
+++ b/libobs-opengl/GL/wgl_obs.c
@@ -26,7 +26,20 @@ static void* AppleGLGetProcAddress (const const char *name)
 #pragma warning(disable: 4996)
 #endif
 	
-#define IntGetProcAddress(name) wglGetProcAddress((LPCSTR)name)
+static PROC WinGetProcAddress(const char *name)
+{
+	static HMODULE glMod = NULL;
+	PROC pFunc = wglGetProcAddress((LPCSTR)name);
+
+	if (pFunc) return pFunc;
+
+	if (NULL == glMod)
+		glMod = GetModuleHandleA("OpenGL32.dll");
+
+	return (PROC)GetProcAddress(glMod, (LPCSTR)name);
+}
+
+#define IntGetProcAddress(name) WinGetProcAddress(name)
 #endif

 /* Linux, FreeBSD, other */