[vlc-commits] opengl: remove legacy lock/unlock

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 19 01:29:17 2016 +0200| [923c9f42f4b45381fde49f7c78f30c7a80c7ae51] | committer: Rémi Denis-Courmont

opengl: remove legacy lock/unlock

We don´t need two pair of names for the same pairs of callbacks.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=923c9f42f4b45381fde49f7c78f30c7a80c7ae51
---

 include/vlc_opengl.h                 | 4 ----
 modules/video_output/caopengllayer.m | 4 ++--
 modules/video_output/ios2.m          | 4 ++--
 modules/video_output/macosx.m        | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index d6249e3..53d73d0 100644
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -49,10 +49,6 @@ struct vlc_gl_t
     void (*releaseCurrent)(vlc_gl_t *);
     void (*resize)(vlc_gl_t *, unsigned, unsigned);
     void (*swap)(vlc_gl_t *);
-#ifdef __APPLE__
-    int  (*lock)(vlc_gl_t *);
-    void (*unlock)(vlc_gl_t *);
-#endif
     void*(*getProcAddress)(vlc_gl_t *, const char *);
 };
 
diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 912239e..b3c60c9 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -171,8 +171,8 @@ static int Open (vlc_object_t *p_this)
             msg_Warn(vd, "we might not have an OpenGL context yet");
 
         /* Initialize common OpenGL video display */
-        sys->gl.lock = OpenglLock;
-        sys->gl.unlock = OpenglUnlock;
+        sys->gl.makeCurrent = OpenglLock;
+        sys->gl.releaseCurrent = OpenglUnlock;
         sys->gl.swap = OpenglSwap;
         sys->gl.getProcAddress = OurGetProcAddress;
         sys->gl.sys = sys;
diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 8189162..09f4caf 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -256,8 +256,8 @@ static int Open(vlc_object_t *this)
         if (!sys->zero_copy) {
             msg_Dbg(vd, "will use regular OpenGL rendering");
             /* Initialize common OpenGL video display */
-            sys->gl.lock = OpenglESClean;
-            sys->gl.unlock = nil;
+            sys->gl.makeCurrent = OpenglESClean;
+            sys->gl.releaseCurrent = OpenglESNoop;
             sys->gl.swap = OpenglESSwap;
             sys->gl.getProcAddress = OurGetProcAddress;
             sys->gl.sys = sys;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index a8751ea..a5b0c82 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -253,8 +253,8 @@ static int Open (vlc_object_t *this)
         }
 
         /* Initialize common OpenGL video display */
-        sys->gl.lock = OpenglLock;
-        sys->gl.unlock = OpenglUnlock;
+        sys->gl.makeCurrent = OpenglLock;
+        sys->gl.releaseCurrent = OpenglUnlock;
         sys->gl.swap = OpenglSwap;
         sys->gl.getProcAddress = OurGetProcAddress;
         sys->gl.sys = sys;