<html><head></head><body>Do you really want to design the API according to the legacy? And what will the definition of "core" be even then? It depends on the API & version AFAIU, so it seems pretty insane to expect the GL user to know.<br><br><div class="gmail_quote">Le 23 mai 2018 10:19:27 GMT+03:00, Thomas Guillem <thomas@gllm.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">- Same implementation than vlc_gl_GetProcAddress for GLX, ios, macos.<br>- NULL for WGL<br>- Depending on EGL_KHR_get_all_proc_addresses for egl<br>---<br> include/vlc_opengl.h | 6 ++++++<br> modules/video_output/caopengllayer.m | 2 +-<br> modules/video_output/glx.c | 2 +-<br> modules/video_output/ios.m | 2 +-<br> modules/video_output/macosx.m | 2 +-<br> modules/video_output/opengl/egl.c | 4 ++++<br> 6 files changed, 14 insertions(+), 4 deletions(-)<br><br>diff --git a/include/vlc_opengl.h b/include/vlc_opengl.h<br>index 178d1587da..83324e25aa 100644<br>--- a/include/vlc_opengl.h<br>+++ b/include/vlc_opengl.h<br>@@ -50,6 +50,7 @@ struct vlc_gl_t<br> void (*resize)(vlc_gl_t *, unsigned, unsigned);<br> void (*swap)(vlc_gl_t *);<br> void*(*getProcAddress)(vlc_gl_t *, const char *);<br>+ void*(*getCoreProcAddress)(vlc_gl_t *, const char *);<br> <br> enum {<br> VLC_GL_EXT_DEFAULT,<br>@@ -112,6 +113,11 @@ static inline void *vlc_gl_GetProcAddress(vlc_gl_t *gl, const char *name)<br> return gl->getProcAddress(gl, name);<br> }<br> <br>+static inline void *vlc_gl_GetCoreProcAddress(vlc_gl_t *gl, const char *name)<br>+{<br>+ return gl->getCoreProcAddress ? gl->getCoreProcAddress(gl, name) : NULL;<br>+}<br>+<br> VLC_API vlc_gl_t *vlc_gl_surface_Create(vlc_object_t *,<br> const struct vout_window_cfg_t *,<br> struct vout_window_t **) VLC_USED;<br>diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m<br>index b690ce0f21..57a89ae4f1 100644<br>--- a/modules/video_output/caopengllayer.m<br>+++ b/modules/video_output/caopengllayer.m<br>@@ -173,7 +173,7 @@ static int Open (vlc_object_t *p_this)<br> sys->gl->makeCurrent = OpenglLock;<br> sys->gl->releaseCurrent = OpenglUnlock;<br> sys->gl->swap = OpenglSwap;<br>- sys->gl->getProcAddress = OurGetProcAddress;<br>+ sys->gl->getProcAddress = sys->gl->getCoreProcAddress = OurGetProcAddress;<br> <br> struct gl_sys *glsys = sys->gl->sys = malloc(sizeof(*glsys));<br> if (!sys->gl->sys)<br>diff --git a/modules/video_output/glx.c b/modules/video_output/glx.c<br>index 17188f24b2..38b97db096 100644<br>--- a/modules/video_output/glx.c<br>+++ b/modules/video_output/glx.c<br>@@ -207,7 +207,7 @@ static int Open (vlc_object_t *obj)<br> gl->releaseCurrent = ReleaseCurrent;<br> gl->resize = NULL;<br> gl->swap = SwapBuffers;<br>- gl->getProcAddress = GetSymbol;<br>+ gl->getProcAddress = gl->getCoreProcAddress = GetSymbol;<br> <br> bool is_swap_interval_set = false;<br> <br>diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m<br>index 36075488b7..7daa0b2aa5 100644<br>--- a/modules/video_output/ios.m<br>+++ b/modules/video_output/ios.m<br>@@ -192,7 +192,7 @@ static int Open(vlc_object_t *this)<br> sys->gl->makeCurrent = GLESMakeCurrent;<br> sys->gl->releaseCurrent = GLESReleaseCurrent;<br> sys->gl->swap = GLESSwap;<br>- sys->gl->getProcAddress = OurGetProcAddress;<br>+ sys->gl->getProcAddress = sys->gl->getCoreProcAddress = OurGetProcAddress;<br> <br> if (vlc_gl_MakeCurrent(sys->gl) != VLC_SUCCESS)<br> goto bailout;<br>diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m<br>index 406281db0d..967e8648ae 100644<br>--- a/modules/video_output/macosx.m<br>+++ b/modules/video_output/macosx.m<br>@@ -214,7 +214,7 @@ static int Open (vlc_object_t *this)<br> sys->gl->makeCurrent = OpenglLock;<br> sys->gl->releaseCurrent = OpenglUnlock;<br> sys->gl->swap = OpenglSwap;<br>- sys->gl->getProcAddress = OurGetProcAddress;<br>+ sys->gl->getProcAddress = sys->gl->getCoreProcAddress = OurGetProcAddress;<br> <br> var_SetAddress(vd->obj.parent, "macosx-glcontext",<br> [[sys->glView openGLContext] CGLContextObj]);<br>diff --git a/modules/video_output/opengl/egl.c b/modules/video_output/opengl/egl.c<br>index 4543f2d66a..a300d37408 100644<br>--- a/modules/video_output/opengl/egl.c<br>+++ b/modules/video_output/opengl/egl.c<br>@@ -394,6 +394,10 @@ static int Open (vlc_object_t *obj, const struct gl_api *api)<br> gl->resize = Resize;<br> gl->swap = SwapBuffers;<br> gl->getProcAddress = GetSymbol;<br>+ if (ext && vlc_gl_HasExtension(ext, "EGL_KHR_get_all_proc_addresses"))<br>+ gl->getCoreProcAddress = GetSymbol;<br>+ else<br>+ gl->getCoreProcAddress = NULL;<br> gl->egl.queryString = QueryString;<br> <br> sys->eglCreateImageKHR = (void *)eglGetProcAddress("eglCreateImageKHR");</pre></blockquote></div><br>
-- <br>
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>