forked from macports/macports-ports
-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
33242b4
commit 41c96fd
Showing
2 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/src/glx/glxext.c b/src/glx/glxext.c | ||
index 8d7518e1f47868df6f4ff413e0ab2e8a24ce5a67..98e21a21b43621914d38e853cce6befd312a8131 100644 | ||
--- src/glx/glxext.c | ||
+++ src/glx/glxext.c | ||
@@ -790,6 +790,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName) | ||
__glXEnableDirectExtension(psc, "GLX_INTEL_swap_event"); | ||
} | ||
|
||
+#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) | ||
mask = driGetAPIMask(psc->frontend_screen); | ||
|
||
__glXEnableDirectExtension(psc, "GLX_ARB_create_context"); | ||
@@ -846,6 +847,7 @@ bind_extensions(struct glx_screen *psc, const char *driverName) | ||
psc->keep_native_window_glx_drawable = keep_native_window_glx_drawable; | ||
} | ||
} | ||
+#endif | ||
} | ||
|
||
|
||
@@ -1078,6 +1080,13 @@ __glXInitialize(Display * dpy) | ||
glx_driver |= GLX_DRIVER_SW; | ||
#endif | ||
|
||
+#if defined(GLX_USE_APPLEGL) && !defined(GLX_USE_APPLE) | ||
+ if (!applegl_create_display(dpyPriv)) { | ||
+ free(dpyPriv); | ||
+ return NULL; | ||
+ } | ||
+#endif | ||
+ | ||
if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, glx_driver, !env)) { | ||
Bool fail = True; | ||
#if defined(GLX_DIRECT_RENDERING) && (!defined(GLX_USE_APPLEGL) || defined(GLX_USE_APPLE)) |