Commit 572ee290 authored by Felix Paul Kühne's avatar Felix Paul Kühne

vout_macosx: implement gl.getProcAddress

parent 5db50265
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <OpenGL/OpenGL.h> #import <OpenGL/OpenGL.h>
#import <dlfcn.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
...@@ -63,6 +64,8 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub ...@@ -63,6 +64,8 @@ static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *sub
static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture); static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture);
static int Control (vout_display_t *vd, int query, va_list ap); static int Control (vout_display_t *vd, int query, va_list ap);
static void *OurGetProcAddress(vlc_gl_t *, const char *);
static int OpenglLock (vlc_gl_t *gl); static int OpenglLock (vlc_gl_t *gl);
static void OpenglUnlock (vlc_gl_t *gl); static void OpenglUnlock (vlc_gl_t *gl);
static void OpenglSwap (vlc_gl_t *gl); static void OpenglSwap (vlc_gl_t *gl);
...@@ -115,6 +118,14 @@ struct vout_display_sys_t ...@@ -115,6 +118,14 @@ struct vout_display_sys_t
bool has_first_frame; bool has_first_frame;
}; };
static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
{
VLC_UNUSED(gl);
return dlsym(RTLD_DEFAULT, name);
}
static int Open (vlc_object_t *this) static int Open (vlc_object_t *this)
{ {
vout_display_t *vd = (vout_display_t *)this; vout_display_t *vd = (vout_display_t *)this;
...@@ -203,7 +214,7 @@ static int Open (vlc_object_t *this) ...@@ -203,7 +214,7 @@ static int Open (vlc_object_t *this)
sys->gl.lock = OpenglLock; sys->gl.lock = OpenglLock;
sys->gl.unlock = OpenglUnlock; sys->gl.unlock = OpenglUnlock;
sys->gl.swap = OpenglSwap; sys->gl.swap = OpenglSwap;
sys->gl.getProcAddress = NULL; sys->gl.getProcAddress = OurGetProcAddress;
sys->gl.sys = sys; sys->gl.sys = sys;
const vlc_fourcc_t *subpicture_chromas; const vlc_fourcc_t *subpicture_chromas;
video_format_t fmt = vd->fmt; video_format_t fmt = vd->fmt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment