summaryrefslogtreecommitdiffstats
path: root/src/glx/apple
diff options
context:
space:
mode:
authorJeremy Huddleston <[email protected]>2011-06-14 00:45:12 -0700
committerJeremy Huddleston <[email protected]>2011-06-14 00:48:20 -0700
commita128355ecb5b782a69461a04991e4cffb32249db (patch)
tree7ba844ab2d0faa1e6e948075bea71495e8f22399 /src/glx/apple
parentc17fb8539fcdeb6ebbc0c8a9ff010d1bc01b695f (diff)
apple: Set the glapi dispatch table on context bind
Signed-off-by: Jeremy Huddleston <[email protected]>
Diffstat (limited to 'src/glx/apple')
-rw-r--r--src/glx/apple/apple_glapi.c2
-rw-r--r--src/glx/apple/apple_glx.c1
-rw-r--r--src/glx/apple/apple_glx.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/glx/apple/apple_glapi.c b/src/glx/apple/apple_glapi.c
index 66933f5a20c..0c89f46779c 100644
--- a/src/glx/apple/apple_glapi.c
+++ b/src/glx/apple/apple_glapi.c
@@ -52,7 +52,7 @@
struct _glapi_table * __ogl_framework_api = NULL;
struct _glapi_table * __applegl_api = NULL;
-void apple_xgl_init_direct(void) {
+void apple_glapi_set_dispatch(void) {
static void *handle;
const char *opengl_framework_path;
diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
index a76cb4cac1f..d94c1e0fb16 100644
--- a/src/glx/apple/apple_glx.c
+++ b/src/glx/apple/apple_glx.c
@@ -131,7 +131,6 @@ apple_init_glx(Display * dpy)
}
apple_cgl_init();
- apple_xgl_init_direct();
(void) apple_glx_get_client_id();
XAppleDRISetSurfaceNotifyHandler(surface_notify_handler);
diff --git a/src/glx/apple/apple_glx.h b/src/glx/apple/apple_glx.h
index 25f5ea66ee3..c70fc009dd5 100644
--- a/src/glx/apple/apple_glx.h
+++ b/src/glx/apple/apple_glx.h
@@ -45,6 +45,6 @@ void apple_glx_swap_buffers(void *ptr);
void apple_glx_waitx(Display * dpy, void *ptr);
int apple_get_dri_event_base(void);
-void apple_xgl_init_direct(void);
+void apple_glapi_set_dispatch(void);
#endif