From f987625d5a84546b564bd15635c4051af5dc7113 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Sun, 28 Dec 2014 19:10:44 +0100
Subject: cocoa: move the gl function loader to gl_cocoa.c

---
 video/out/cocoa_common.h |  2 --
 video/out/cocoa_common.m | 14 --------------
 video/out/gl_cocoa.c     | 16 +++++++++++++++-
 3 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'video/out')

diff --git a/video/out/cocoa_common.h b/video/out/cocoa_common.h
index be68b7ca22..30792a674e 100644
--- a/video/out/cocoa_common.h
+++ b/video/out/cocoa_common.h
@@ -24,8 +24,6 @@
 
 struct vo_cocoa_state;
 
-void *vo_cocoa_glgetaddr(const char *s);
-
 int vo_cocoa_init(struct vo *vo);
 void vo_cocoa_uninit(struct vo *vo);
 
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 6f4603b65f..01e28aceda 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -20,7 +20,6 @@
 #import <Cocoa/Cocoa.h>
 #import <CoreServices/CoreServices.h> // for CGDisplayHideCursor
 #import <IOKit/pwr_mgt/IOPMLib.h>
-#include <dlfcn.h>
 
 #import "cocoa_common.h"
 #import "video/out/cocoa/window.h"
@@ -112,19 +111,6 @@ static void queue_new_video_size(struct vo *vo, int w, int h)
     }
 }
 
-void *vo_cocoa_glgetaddr(const char *s)
-{
-    void *ret = NULL;
-    void *handle = dlopen(
-        "/System/Library/Frameworks/OpenGL.framework/OpenGL",
-        RTLD_LAZY | RTLD_LOCAL);
-    if (!handle)
-        return NULL;
-    ret = dlsym(handle, s);
-    dlclose(handle);
-    return ret;
-}
-
 static void enable_power_management(struct vo *vo)
 {
     struct vo_cocoa_state *s = vo->cocoa;
diff --git a/video/out/gl_cocoa.c b/video/out/gl_cocoa.c
index 32c66675f0..4cbeda2441 100644
--- a/video/out/gl_cocoa.c
+++ b/video/out/gl_cocoa.c
@@ -20,6 +20,7 @@
  */
 
 #include <OpenGL/OpenGL.h>
+#include <dlfcn.h>
 #include "cocoa_common.h"
 #include "osdep/macosx_versions.h"
 #include "gl_common.h"
@@ -44,6 +45,19 @@ static int cgl_color_size(struct MPGLContext *ctx)
     return value > 16 ? 8 : 5;
 }
 
+static void *cocoa_glgetaddr(const char *s)
+{
+    void *ret = NULL;
+    void *handle = dlopen(
+        "/System/Library/Frameworks/OpenGL.framework/OpenGL",
+        RTLD_LAZY | RTLD_LOCAL);
+    if (!handle)
+        return NULL;
+    ret = dlsym(handle, s);
+    dlclose(handle);
+    return ret;
+}
+
 static bool create_gl_context(struct MPGLContext *ctx)
 {
     struct cgl_context *p = ctx->priv;
@@ -102,7 +116,7 @@ static bool create_gl_context(struct MPGLContext *ctx)
 
     vo_cocoa_create_nsgl_ctx(ctx->vo, p->ctx);
     ctx->depth_r = ctx->depth_g = ctx->depth_b = cgl_color_size(ctx);
-    mpgl_load_functions(ctx->gl, (void *)vo_cocoa_glgetaddr, NULL, ctx->vo->log);
+    mpgl_load_functions(ctx->gl, (void *)cocoa_glgetaddr, NULL, ctx->vo->log);
 
     CGLReleasePixelFormat(p->pix);
 
-- 
cgit v1.2.3