summaryrefslogtreecommitdiffstats
path: root/src/glx/glxext.c
diff options
context:
space:
mode:
authorJeremy Huddleston <[email protected]>2011-06-05 18:50:55 -0400
committerJeremy Huddleston <[email protected]>2011-06-05 20:52:15 -0400
commit1885cf27c9c4642a049c60a8236cb84735cb9eba (patch)
tree1319b66aeb8dfbe9949f047f48ff9ba0bb07cbaf /src/glx/glxext.c
parent3843bbcb4ca4de232dbae6ba3ae619ddfc93508b (diff)
apple: Build darwin using applegl rather than indirect
This reverts portions of 6849916170c0275c13510251a7b217c20f2b993e that caused the darwin config to fail to build due to missing implementations in that commit. See https://bugs.freedesktop.org/show_bug.cgi?id=29162 Signed-off-by: Jeremy Huddleston <[email protected]>
Diffstat (limited to 'src/glx/glxext.c')
-rw-r--r--src/glx/glxext.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 278c71978fa..73c332793a0 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -779,11 +779,12 @@ AllocAndFetchScreenConfigs(Display * dpy, struct glx_display * priv)
psc = (*priv->driswDisplay->createScreen) (i, priv);
#endif
#if defined(GLX_USE_APPLEGL)
- if (psc == NULL && priv->appleglDisplay)
- psc = (*priv->appleglDisplay->createScreen) (i, priv);
-#endif
+ if (psc == NULL)
+ psc = applegl_create_screen(i, priv);
+#else
if (psc == NULL)
psc = indirect_create_screen(i, priv);
+#endif
priv->screens[i] = psc;
}
SyncHandle();