diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2010-05-01 13:59:30 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-05-05 18:17:45 -0700 |
| commit | a18702f067d060ca9d56e9fcd5d2cd1a5093177f (patch) | |
| tree | 9566af0d930ffd01ef1ac6e8894e3dd8f759deff | |
| parent | fca24899cbf5217cee5f884bac267c43f9897197 (diff) | |
darwin: Fix build
This is a regression from e42d84eaba228d4d96a46d116c6ca24581e29439
https://bugs.freedesktop.org/show_bug.cgi?id=27929
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 4d63be67f320839d115987211d0d9b4297f6d17d)
| -rw-r--r-- | src/glx/glxcmds.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 926be1014a..6063cf0c5d 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -887,9 +887,6 @@ glXCopyContext(Display * dpy, GLXContext source, static Bool __glXIsDirect(Display * dpy, GLXContextID contextID) { -#ifdef GLX_USE_APPLEGL /* TODO: apple indirect */ - return GC_IS_DIRECT(gc); -#else #if !defined(USE_XCB) xGLXIsDirectReq *req; xGLXIsDirectReply reply; @@ -925,7 +922,6 @@ __glXIsDirect(Display * dpy, GLXContextID contextID) return reply.isDirect; #endif /* USE_XCB */ -#endif /* GLX_USE_APPLEGL */ } /** @@ -943,7 +939,11 @@ glXIsDirect(Display * dpy, GLXContext gc) else if (GC_IS_DIRECT(gc)) { return GL_TRUE; } +#ifdef GLX_USE_APPLEGL /* TODO: indirect on darwin */ + return GL_FALSE; +#else return __glXIsDirect(dpy, gc->xid); +#endif } PUBLIC GLXPixmap |