diff options
Diffstat (limited to 'xserver/hw/xquartz/darwin.c')
| -rw-r--r-- | xserver/hw/xquartz/darwin.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xserver/hw/xquartz/darwin.c b/xserver/hw/xquartz/darwin.c index 36c149cba..c701eb6ac 100644 --- a/xserver/hw/xquartz/darwin.c +++ b/xserver/hw/xquartz/darwin.c @@ -50,7 +50,7 @@ #include <X11/extensions/XIproto.h> #include "exevents.h" #include "extinit.h" - +#include "glx_extinit.h" #include "xserver-properties.h" #include <sys/types.h> @@ -162,7 +162,6 @@ static PixmapFormatRec formats[] = { { 24, 32, BITMAP_SCANLINE_PAD }, { 32, 32, BITMAP_SCANLINE_PAD } }; -const int NUMFORMATS = sizeof(formats) / sizeof(formats[0]); void DarwinPrintBanner(void) @@ -659,8 +658,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER; // List how we want common pixmap formats to be padded - pScreenInfo->numPixmapFormats = NUMFORMATS; - for (i = 0; i < NUMFORMATS; i++) + pScreenInfo->numPixmapFormats = ARRAY_SIZE(formats); + for (i = 0; i < ARRAY_SIZE(formats); i++) pScreenInfo->formats[i] = formats[i]; // Discover screens and do mode specific initialization @@ -671,6 +670,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) AddScreen(DarwinScreenInit, argc, argv); } + xorgGlxCreateVendor(); + DarwinAdjustScreenOrigins(pScreenInfo); } |