Added vlc_gl_t::getProcAddress() declaration.

diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h
index 64e4b7dc58ac92db2ed2de8d96e3f5338da8427a..c32ab682ca6cc26e2b4205ca7977984fea945709 100644 (file)
--- a/include/vlc_opengl.h
+++ b/include/vlc_opengl.h
@@ -48,6 +48,7 @@ struct vlc_gl_t
     void (*swap)(vlc_gl_t *);
     int  (*lock)(vlc_gl_t *);
     void (*unlock)(vlc_gl_t *);
+    void*(*getProcAddress)(vlc_gl_t *, const char *);
 };
 
 enum {
@@ -80,4 +81,9 @@ static inline void vlc_gl_Swap(vlc_gl_t *gl)
     gl->swap(gl);
 }
 
+static inline void *vlc_gl_GetProcAddress(vlc_gl_t *gl, const char *name)
+{
+    return (gl->getProcAddress != NULL) ? gl->getProcAddress(gl, name) : NULL;
+}
+
 #endif /* VLC_GL_H */

diff --git a/modules/video_output/egl.c b/modules/video_output/egl.c
index f7f0960de0f1cf0cd951785d717b1514efcd92f4..d4416fc1717d776cf1407d23fc0d51eff2cb6e55 100644 (file)
--- a/modules/video_output/egl.c
+++ b/modules/video_output/egl.c
@@ -195,6 +195,7 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)
     gl->swap = SwapBuffers;
     gl->lock = NULL;
     gl->unlock = NULL;
+    gl->getProcAddress = NULL;
     return VLC_SUCCESS;
 
 error:

diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index b4e04475e11eaa62bbdd82cb4532ae31648dbdeb..4d6121a7bd6cdcc381b8604e4f4d1a68a85b64db 100644 (file)
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -148,6 +148,7 @@ static int Open(vlc_object_t *this)
     sys->gl.lock = OpenglClean; // We don't do locking, but sometimes we need to cleanup the framebuffer
     sys->gl.unlock = NULL;
     sys->gl.swap = OpenglSwap;
+       sys->gl.getProcAddress = NULL;
     sys->gl.sys = sys;
 
     if (vout_display_opengl_Init(&sys->vgl, &vd->fmt, &sys->gl))

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 07c50e85294552bb4bcd2efd77b76eeb4968b397..5ea64b2666e2c604fc7a8a5c94672af55d951d9f 100644 (file)
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -187,6 +187,7 @@ static int Open(vlc_object_t *this)
     sys->gl.lock = OpenglLock;
     sys->gl.unlock = OpenglUnlock;
     sys->gl.swap = OpenglSwap;
+    sys->gl.getProcAddress = NULL;
     sys->gl.sys = sys;
 
     if (vout_display_opengl_Init(&sys->vgl, &vd->fmt, &sys->gl))

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 7a76f3187fa038b4905f8b7a22505e64631b60a6..dcbb6abe71795092c1528bd042ed87aa77da6dd1 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -111,6 +111,7 @@ static int Open(vlc_object_t *object)
     sys->gl.lock = NULL;
     sys->gl.unlock = NULL;
     sys->gl.swap = Swap;
+    sys->gl.getProcAddress = NULL;
     sys->gl.sys = vd;
 
     video_format_t fmt = vd->fmt;

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 4a79df106dd164f4e62b319f0cdfc103b8e4abfd..4ba551dfeb2c97ad5ce3c2f76951df3faa20d632 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -362,6 +362,7 @@ static int Open (vlc_object_t *obj)
     sys->gl.lock = NULL;
     sys->gl.unlock = NULL;
     sys->gl.swap = SwapBuffers;
+    sys->gl.getProcAddress = NULL;
     sys->gl.sys = sys;
 
     if (vout_display_opengl_Init (&sys->vgl, &vd->fmt, &sys->gl))