[vlc-commits] glx: make GLX_ARB_get_proc_address mandatory

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed May 23 08:43:35 2018 +0200| [5dab3910d7ea04bbc7b71081cf422d4a073b4de8] | committer: Thomas Guillem

glx: make GLX_ARB_get_proc_address mandatory

Since the GL display now depends on getProcAddress().

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

 modules/video_output/glx.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/glx.c b/modules/video_output/glx.c
index cb5d53b7db..8b2ff8f276 100644
--- a/modules/video_output/glx.c
+++ b/modules/video_output/glx.c
@@ -35,6 +35,10 @@
 #include <vlc_vout_window.h>
 #include <vlc_xlib.h>
 
+#ifndef GLX_ARB_get_proc_address
+#error GLX_ARB_get_proc_address extension missing
+#endif
+
 typedef struct vlc_gl_sys_t
 {
     Display *display;
@@ -68,11 +72,7 @@ static void SwapBuffers (vlc_gl_t *gl)
 static void *GetSymbol(vlc_gl_t *gl, const char *procname)
 {
     (void) gl;
-#ifdef GLX_ARB_get_proc_address
     return glXGetProcAddressARB ((const GLubyte *)procname);
-#else
-    return NULL;
-#endif
 }
 
 static bool CheckGLX (vlc_object_t *vd, Display *dpy)
@@ -209,7 +209,6 @@ static int Open (vlc_object_t *obj)
     gl->swap = SwapBuffers;
     gl->getProcAddress = GetSymbol;
 
-#ifdef GLX_ARB_get_proc_address
     bool is_swap_interval_set = false;
 
     MakeCurrent (gl);
@@ -235,7 +234,6 @@ static int Open (vlc_object_t *obj)
     }
 # endif
     ReleaseCurrent (gl);
-#endif
 
     /* XXX: Prevent other gl backends (like EGL) to be opened within the same
      * X11 window instance. Indeed, using EGL after GLX on the same X11 window