From eb3c014e1710bf0b93bda10ddb9b795cd150d02d Mon Sep 17 00:00:00 2001 From: George Staplin Date: Mon, 6 Oct 2008 18:05:12 -0600 Subject: [PATCH] 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(). --- hw/xquartz/GL/Makefile.am | 4 +++- 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 41d4566dc..76fc3c4c3 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 8189e0dc3..2ae5becfa 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -77,6 +77,9 @@ #include "quartz.h" //#include "darwinClut8.h" +#include "GL/visualConfigs.h" + + #ifdef ENABLE_DEBUG_LOG FILE *debug_log_fp = NULL; #endif @@ -180,7 +183,6 @@ static Bool DarwinSaveScreen(ScreenPtr pScreen, int on) return TRUE; } - /* * DarwinAddScreen * This is a callback from dix during AddScreen() from InitOutput(). @@ -227,6 +229,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)