Browse Source

apple: Set the glapi dispatch table on context bind

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
tags/mesa-7.11-rc1
Jeremy Huddleston 14 years ago
parent
commit
a128355ecb
4 changed files with 4 additions and 3 deletions
  1. 1
    1
      src/glx/apple/apple_glapi.c
  2. 0
    1
      src/glx/apple/apple_glx.c
  3. 1
    1
      src/glx/apple/apple_glx.h
  4. 2
    0
      src/glx/applegl_glx.c

+ 1
- 1
src/glx/apple/apple_glapi.c View File

@@ -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;


+ 0
- 1
src/glx/apple/apple_glx.c View File

@@ -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);

+ 1
- 1
src/glx/apple/apple_glx.h View File

@@ -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

+ 2
- 0
src/glx/applegl_glx.c View File

@@ -59,6 +59,8 @@ applegl_bind_context(struct glx_context *gc, struct glx_context *old,
if (error)
return 1; /* GLXBadContext is the same as Success (0) */

apple_glapi_set_dispatch();

return Success;
}


Loading…
Cancel
Save