diff options
| author | George Staplin <georgestaplin@george-staplins-mac-pro.local> | 2008-10-06 18:05:12 -0600 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-10-08 18:44:24 -0700 |
| commit | 63abdf61151cc90f769ed1708ee19b6c434c27c9 (patch) | |
| tree | e2bd6453d9cb3df6301714d927fc2ae1b0441599 | |
| parent | a8f5d422c9c0a39f55e80bbd180439b6ec3a805c (diff) | |
XQuartz: GL: Add the new C code to the Makefile.am.
Commit the darwin.c changes I missed in the last commit, for calling
setVisualConfigs().
(cherry picked from commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d)
| -rw-r--r-- | hw/xquartz/GL/Makefile.am | 4 | ||||
| -rw-r--r-- | hw/xquartz/darwin.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am index 450ee5c5b..c528d2a78 100644 --- a/hw/xquartz/GL/Makefile.am +++ b/hw/xquartz/GL/Makefile.am @@ -10,4 +10,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/miext/damage libCGLCore_la_SOURCES = \ - indirect.c + indirect.c \ + capabilities.c \ + visualConfigs.c diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index d728e9855..184fb960f 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -75,6 +75,9 @@ #include "quartz.h" //#include "darwinClut8.h" +#include "GL/visualConfigs.h" + + #ifdef ENABLE_DEBUG_LOG FILE *debug_log_fp = NULL; #endif @@ -179,7 +182,6 @@ static Bool DarwinSaveScreen(ScreenPtr pScreen, int on) return TRUE; } - /* * DarwinAddScreen * This is a callback from dix during AddScreen() from InitOutput(). @@ -226,6 +228,8 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv) miSetPixmapDepths(); + setVisualConfigs(); + // machine independent screen init // setup _Screen structure in pScreen if (monitorResolution) |