[vlc-commits] Used glXGetProcAddressARB() when possible otherwise return NULL in glx.

Laurent Aimar git at videolan.org
Thu Jun 2 18:47:29 CEST 2011


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jun  2 18:43:50 2011 +0200| [8f93cd2d47125e8ffa9c57b2f9b55767556b1a57] | committer: Laurent Aimar

Used glXGetProcAddressARB() when possible otherwise return NULL in glx.

It is more compatible than to use glXGetProcAddress() which is not always
present (need opengl >= 1.4).

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

 modules/video_output/xcb/glx.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index d2ce803..e1fc6dd 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -470,7 +470,11 @@ static void SwapBuffers (vlc_gl_t *gl)
 static void *GetProcAddress (vlc_gl_t *gl, const char *name)
 {
     (void)gl;
-    return glXGetProcAddress ((const GLubyte *)name);
+#ifdef GLX_ARB_get_proc_address
+    return glXGetProcAddressARB ((const GLubyte *)name);
+#else
+    return NULL;
+#endif
 }
 
 /**



More information about the vlc-commits mailing list