xserver: Branch 'xorg-server-1.4-apple' - 4 commits
George Peter Staplin
gstaplin at kemper.freedesktop.org
Tue Oct 7 10:57:21 PDT 2008
hw/xquartz/GL/Makefile.am | 4 -
hw/xquartz/GL/capabilities.c | 108 +++++++++++++++++++++++++++++
hw/xquartz/GL/capabilities.h | 37 +++++++++
hw/xquartz/GL/visualConfigs.c | 156 ++++++++++++++++++++++++++++++++++++++++++
hw/xquartz/GL/visualConfigs.h | 28 +++++++
hw/xquartz/darwin.c | 8 +-
6 files changed, 339 insertions(+), 2 deletions(-)
New commits:
commit 97173d4eda142c73bb975cc05225b791778f85af
Author: George Staplin <georgestaplin at george-staplins-mac-pro.local>
Date: Tue Oct 7 11:39:44 2008 -0600
XQuartz: Call setVisualConfigs in InitOutput, and only when GLXEXT is defined.
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 2ae5bec..890fb6f 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -229,8 +229,6 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
miSetPixmapDepths();
- setVisualConfigs();
-
// machine independent screen init
// setup _Screen structure in pScreen
if (monitorResolution)
@@ -602,6 +600,10 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
generation = serverGeneration;
}
+#ifdef GLXEXT
+ setVisualConfigs();
+#endif
+
// Discover screens and do mode specific initialization
QuartzInitOutput(argc, argv);
commit 190a3d5e5de9915931928fb8e6da88bb9644cda4
Author: George Staplin <georgestaplin at george-staplins-mac-pro.local>
Date: Tue Oct 7 11:31:48 2008 -0600
XQuartz: GL: Add the proper license information to the new files, and add more commentary to setVisualConfigs().
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 3a54025..479fc93 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#include <stdio.h>
#include <stdlib.h>
#include <OpenGL/OpenGL.h>
diff --git a/hw/xquartz/GL/capabilities.h b/hw/xquartz/GL/capabilities.h
index 74487be..6a026cf 100644
--- a/hw/xquartz/GL/capabilities.h
+++ b/hw/xquartz/GL/capabilities.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifndef CAPABILITIES_H
#define CAPABILITIES_H
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index 05dfa19..821fad2 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -1,3 +1,33 @@
+/*
+ * Copyright (c) 2007, 2008 Apple Inc.
+ * Copyright (c) 2004 Torrey T. Lyons. All Rights Reserved.
+ * Copyright (c) 2002 Greg Parker. All Rights Reserved.
+ *
+ * Portions of this file are copied from Mesa's xf86glx.c,
+ * which contains the following copyright:
+ *
+ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
@@ -28,6 +58,7 @@
extern BOOL enable_stereo;
+/* Based originally on code from indirect.c which was based on code from i830_dri.c. */
void setVisualConfigs(void) {
int numConfigs = 0;
__GLXvisualConfig *visualConfigs = NULL;
@@ -41,14 +72,21 @@ void setVisualConfigs(void) {
return;
}
- /* count num configs:
- 2 stereo (on, off) (optional)
- 2 Z buffer (0, 24 bit)
- 2 AUX buffer (0, 2)
- 2 buffers (single, double)
- 2 stencil (0, 8 bit)
- 2 accum (0, 64 bit)
- = 64 configs with stereo, or 32 without */
+ /*
+ caps->stereo is 0 or 1, but we need at least 1 iteration of the loop, so we treat
+ a true caps->stereo as 2.
+
+ The depth size is 0 or 24. Thus we do 2 iterations for that.
+
+ caps->aux_buffers (when available/non-zero) result in 2 iterations instead of 1.
+
+ caps->buffers indicates whether we have single or double buffering.
+
+ 2 iterations for stencil (on and off (with a stencil size of 8)).
+
+ 2 iterations for accum (on and off (with an accum color size of 16)).
+ */
+
numConfigs = ((enable_stereo && caps->stereo) ? 2 : 1) * 2 *
(caps->aux_buffers ? 2 : 1) * (caps->buffers) * 2 * 2;
@@ -89,7 +127,7 @@ void setVisualConfigs(void) {
visualConfigs[i].stereo = stereo ? TRUE : FALSE;
visualConfigs[i].bufferSize = -1;
- visualConfigs[i].depthSize = depth? 24 : 0;
+ visualConfigs[i].depthSize = depth ? 24 : 0;
visualConfigs[i].stencilSize = stencil ? 8 : 0;
visualConfigs[i].auxBuffers = aux ? caps->aux_buffers : 0;
visualConfigs[i].level = 0;
diff --git a/hw/xquartz/GL/visualConfigs.h b/hw/xquartz/GL/visualConfigs.h
index f9cd886..b9e6ae7 100644
--- a/hw/xquartz/GL/visualConfigs.h
+++ b/hw/xquartz/GL/visualConfigs.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2008 Apple Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
#ifndef VISUAL_CONFIGS_H
#define VISUAL_CONFIGS_H
commit eb3c014e1710bf0b93bda10ddb9b795cd150d02d
Author: George Staplin <georgestaplin at george-staplins-mac-pro.local>
Date: Mon Oct 6 18:05:12 2008 -0600
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().
diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am
index 41d4566..76fc3c4 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 8189e0d..2ae5bec 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)
commit fc86f9e4482043eca76d9d7a96e166be1aabf674
Author: George Staplin <georgestaplin at george-staplins-mac-pro.local>
Date: Mon Oct 6 18:01:23 2008 -0600
XQuartz: GL: Provide code for getting the capabilities of the underlying system's CGL.
Add a setVisualConfigs that is called before the fbScreenInit, to setup the __GLXvisualConfigs.
diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
new file mode 100644
index 0000000..3a54025
--- /dev/null
+++ b/hw/xquartz/GL/capabilities.c
@@ -0,0 +1,86 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+#include "capabilities.h"
+
+//#define DIAGNOSTIC 0
+
+static void handleBufferModes(struct glCapabilities *cap, GLint bufferModes) {
+ if(bufferModes & kCGLStereoscopicBit) {
+ cap->stereo = true;
+ }
+
+ if(bufferModes & kCGLDoubleBufferBit) {
+ cap->buffers = 2;
+ } else {
+ cap->buffers = 1;
+ }
+}
+
+static void initCapabilities(struct glCapabilities *cap) {
+ cap->stereo = cap->buffers = cap->aux_buffers = 0;
+}
+
+enum {
+ MAX_DISPLAYS = 32
+};
+
+/*Return true if an error occured. */
+bool getGlCapabilities(struct glCapabilities *cap) {
+ CGDirectDisplayID dspys[MAX_DISPLAYS];
+ CGDisplayErr err;
+ CGOpenGLDisplayMask displayMask;
+ CGDisplayCount i, displayCount = 0;
+
+ initCapabilities(cap);
+
+ err = CGGetActiveDisplayList(MAX_DISPLAYS, dspys, &displayCount);
+ if(err) {
+#ifdef DIAGNOSTIC
+ fprintf(stderr, "CGGetActiveDisplayList %s\n", CGLErrorString (err));
+#endif
+ return true;
+ }
+
+ for(i = 0; i < displayCount; ++i) {
+ displayMask = CGDisplayIDToOpenGLDisplayMask(dspys[i]);
+
+ CGLRendererInfoObj info;
+ GLint numRenderers = 0, r, accelerated = 0, flags = 0, aux = 0;
+
+ err = CGLQueryRendererInfo (displayMask, &info, &numRenderers);
+ if(!err) {
+ CGLDescribeRenderer (info, 0, kCGLRPRendererCount, &numRenderers);
+ for(r = 0; r < numRenderers; ++r) {
+ // find accelerated renderer (assume only one)
+ CGLDescribeRenderer (info, r, kCGLRPAccelerated, &accelerated);
+ if(accelerated) {
+ err = CGLDescribeRenderer(info, r, kCGLRPBufferModes, &flags);
+ if(err) {
+ CGLDestroyRendererInfo(info);
+ return true;
+ }
+
+ handleBufferModes(cap, flags);
+
+ err = CGLDescribeRenderer(info, r, kCGLRPMaxAuxBuffers, &aux);
+ if(err) {
+ CGLDestroyRendererInfo(info);
+ return true;
+ }
+
+ cap->aux_buffers = aux;
+ }
+ }
+ CGLDestroyRendererInfo(info);
+ }
+ }
+
+ /* No error occured. We are done. */
+ return false;
+}
diff --git a/hw/xquartz/GL/capabilities.h b/hw/xquartz/GL/capabilities.h
new file mode 100644
index 0000000..74487be
--- /dev/null
+++ b/hw/xquartz/GL/capabilities.h
@@ -0,0 +1,15 @@
+#ifndef CAPABILITIES_H
+#define CAPABILITIES_H
+
+#include <stdbool.h>
+
+struct glCapabilities {
+ int stereo;
+ int aux_buffers;
+ int buffers;
+ /*TODO handle STENCIL and ACCUM*/
+};
+
+bool getGlCapabilities(struct glCapabilities *cap);
+
+#endif
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
new file mode 100644
index 0000000..05dfa19
--- /dev/null
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -0,0 +1,118 @@
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "dri.h"
+
+#include <OpenGL/OpenGL.h>
+#include <OpenGL/CGLContext.h>
+
+#include <GL/gl.h>
+#include <GL/glxproto.h>
+#include <windowstr.h>
+#include <resource.h>
+#include <GL/glxint.h>
+#include <GL/glxtokens.h>
+#include <scrnintstr.h>
+#include <glxserver.h>
+#include <glxscreens.h>
+#include <glxdrawable.h>
+#include <glxcontext.h>
+#include <glxext.h>
+#include <glxutil.h>
+#include <glxscreens.h>
+#include <GL/internal/glcore.h>
+
+#include "capabilities.h"
+#include "visualConfigs.h"
+
+extern BOOL enable_stereo;
+
+void setVisualConfigs(void) {
+ int numConfigs = 0;
+ __GLXvisualConfig *visualConfigs = NULL;
+ void **visualPrivates = NULL;
+ struct glCapabilities caps[1];
+ int stereo, depth, aux, buffers, stencil, accum;
+ int i = 0;
+
+ if(getGlCapabilities(caps)) {
+ ErrorF("error from getGlCapabilities()!\n");
+ return;
+ }
+
+ /* count num configs:
+ 2 stereo (on, off) (optional)
+ 2 Z buffer (0, 24 bit)
+ 2 AUX buffer (0, 2)
+ 2 buffers (single, double)
+ 2 stencil (0, 8 bit)
+ 2 accum (0, 64 bit)
+ = 64 configs with stereo, or 32 without */
+
+ numConfigs = ((enable_stereo && caps->stereo) ? 2 : 1) * 2 *
+ (caps->aux_buffers ? 2 : 1) * (caps->buffers) * 2 * 2;
+
+ visualConfigs = xcalloc(sizeof(*visualConfigs), numConfigs);
+ visualPrivates = xcalloc(sizeof(void *), numConfigs);
+
+ if (NULL != visualConfigs) {
+ i = 0; /* current buffer */
+ for (stereo = 0; stereo < ((enable_stereo && caps->stereo) ? 2 : 1); ++stereo) {
+ for (depth = 0; depth < 2; ++depth) {
+ for (aux = 0; aux < (caps->aux_buffers ? 2 : 1); ++aux) {
+ for (buffers = 0; buffers < caps->buffers; ++buffers) {
+ for (stencil = 0; stencil < 2; ++stencil) {
+ for (accum = 0; accum < 2; ++accum) {
+ visualConfigs[i].vid = -1;
+ visualConfigs[i].class = -1;
+ visualConfigs[i].rgba = TRUE;
+ visualConfigs[i].redSize = -1;
+ visualConfigs[i].greenSize = -1;
+ visualConfigs[i].blueSize = -1;
+ visualConfigs[i].redMask = -1;
+ visualConfigs[i].greenMask = -1;
+ visualConfigs[i].blueMask = -1;
+ visualConfigs[i].alphaMask = 0;
+ if (accum) {
+ visualConfigs[i].accumRedSize = 16;
+ visualConfigs[i].accumGreenSize = 16;
+ visualConfigs[i].accumBlueSize = 16;
+ visualConfigs[i].accumAlphaSize = 16;
+ } else {
+ visualConfigs[i].accumRedSize = 0;
+ visualConfigs[i].accumGreenSize = 0;
+ visualConfigs[i].accumBlueSize = 0;
+ visualConfigs[i].accumAlphaSize = 0;
+ }
+ visualConfigs[i].doubleBuffer = buffers ? TRUE : FALSE;
+ visualConfigs[i].stereo = stereo ? TRUE : FALSE;
+ visualConfigs[i].bufferSize = -1;
+
+ visualConfigs[i].depthSize = depth? 24 : 0;
+ visualConfigs[i].stencilSize = stencil ? 8 : 0;
+ visualConfigs[i].auxBuffers = aux ? caps->aux_buffers : 0;
+ visualConfigs[i].level = 0;
+ visualConfigs[i].visualRating = GLX_NONE_EXT;
+ visualConfigs[i].transparentPixel = 0;
+ visualConfigs[i].transparentRed = 0;
+ visualConfigs[i].transparentGreen = 0;
+ visualConfigs[i].transparentBlue = 0;
+ visualConfigs[i].transparentAlpha = 0;
+ visualConfigs[i].transparentIndex = 0;
+ ++i;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (i != numConfigs) {
+ ErrorF("numConfigs calculation error in setVisualConfigs!\n");
+ abort();
+ }
+
+ GlxSetVisualConfigs(numConfigs, visualConfigs, visualPrivates);
+}
diff --git a/hw/xquartz/GL/visualConfigs.h b/hw/xquartz/GL/visualConfigs.h
new file mode 100644
index 0000000..f9cd886
--- /dev/null
+++ b/hw/xquartz/GL/visualConfigs.h
@@ -0,0 +1,6 @@
+#ifndef VISUAL_CONFIGS_H
+#define VISUAL_CONFIGS_H
+
+void setVisualConfigs(void);
+
+#endif
More information about the xorg-commit
mailing list