summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/GL/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/GL/mesa')
-rw-r--r--xc/programs/Xserver/GL/mesa/src/Imakefile6
-rw-r--r--xc/programs/Xserver/GL/mesa/src/X/Imakefile6
-rw-r--r--xc/programs/Xserver/GL/mesa/src/X/xf86glx.c61
-rw-r--r--xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile4
-rw-r--r--xc/programs/Xserver/GL/mesa/src/math/Imakefile4
-rw-r--r--xc/programs/Xserver/GL/mesa/src/swrast/Imakefile4
-rw-r--r--xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile4
-rw-r--r--xc/programs/Xserver/GL/mesa/src/tnl/Imakefile4
8 files changed, 68 insertions, 25 deletions
diff --git a/xc/programs/Xserver/GL/mesa/src/Imakefile b/xc/programs/Xserver/GL/mesa/src/Imakefile
index 06ab5cff2..c279b0b27 100644
--- a/xc/programs/Xserver/GL/mesa/src/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.22 2002/06/02 01:21:13 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -8,7 +8,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.22 2002/06/02 01:2
#endif
#endif
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#define IHaveSubdirs
SUBDIRS = math array_cache swrast swrast_setup tnl X $(MODSUBDIR)
#endif
@@ -19,7 +19,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.22 2002/06/02 01:2
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../lib/GL/mesa/src/Imakefile.inc"
#else
#include "../../../../../../lib/GL/mesa/src/Imakefile.inc"
diff --git a/xc/programs/Xserver/GL/mesa/src/X/Imakefile b/xc/programs/Xserver/GL/mesa/src/X/Imakefile
index 16229476f..bf1322065 100644
--- a/xc/programs/Xserver/GL/mesa/src/X/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/X/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.15 2002/06/02 01:21:14 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -15,7 +15,7 @@ SUBDIRS = module
#define NeedToLinkMesaSrc
#define MesaXBuildDir /**/
#define MesaInXServer
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/X/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/X/Imakefile.inc"
@@ -68,7 +68,7 @@ MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
#endif
-#if BuildModuleInSubdir && defined(IHaveModules)
+#if defined(IHaveModules) && BuildModuleInSubdir
LinkSourceFile(xf86glx.c,..)
LinkSourceFile(xf86glx_util.c,..)
#endif
diff --git a/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c b/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c
index 2f3a3a46b..dbea11a7f 100644
--- a/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c
+++ b/xc/programs/Xserver/GL/mesa/src/X/xf86glx.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.15 2002/09/10 02:54:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/mesa/src/X/xf86glx.c,v 1.18 2002/12/17 05:03:24 dawes Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
@@ -47,6 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <glxext.h>
#include <glxutil.h>
#include "xf86glxint.h"
+#include "context.h"
#include "xmesaP.h"
#include <GL/xf86glx.h>
#include "context.h"
@@ -123,25 +124,25 @@ static XMesaVisual find_mesa_visual(int screen, VisualID vid)
for (i = 0; i < pMScr->num_vis; i++) {
if (pMScr->glx_vis[i].vid == vid) {
+ xm_vis = pMScr->xm_vis[i];
break;
}
}
- if (i < pMScr->num_vis) {
- xm_vis = pMScr->xm_vis[i];
- }
return xm_vis;
}
/*
* In the case the driver has no GLX visuals we'll use these.
- * [0] = RGB, double buffered
- * [1] = RGB, double buffered, stencil, accum
- * [2] = CI, double buffered
+ * One thing is funny here: the bufferSize field doesn't always include
+ * the alpha bits. That is, bufferSize may be 24 when we have 8 bits
+ * of red, green, blue and alpha. If set set bufferSize to 32 we may
+ * foul-up the visual matching code below (search for bufferSize).
*/
-#define NUM_FALLBACK_CONFIGS 3
+#define NUM_FALLBACK_CONFIGS 5
static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
+ /* [0] = RGB, double buffered, Z */
{
-1, /* vid */
-1, /* class */
@@ -161,6 +162,7 @@ static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */
},
+ /* [1] = RGB, double buffered, Z, stencil, accum */
{
-1, /* vid */
-1, /* class */
@@ -180,10 +182,51 @@ static __GLXvisualConfig FallbackConfigs[NUM_FALLBACK_CONFIGS] = {
0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
0 /* transparentIndex */
},
+ /* [2] = RGB+Alpha, double buffered, Z, stencil, accum */
+ {
+ -1, /* vid */
+ -1, /* class */
+ True, /* rgba */
+ -1, -1, -1, 8, /* rgba sizes */
+ -1, -1, -1, -1, /* rgba masks */
+ 16, 16, 16, 16, /* rgba accum sizes */
+ True, /* doubleBuffer */
+ False, /* stereo */
+ -1, /* bufferSize */
+ 16, /* depthSize */
+ 8, /* stencilSize */
+ 0, /* auxBuffers */
+ 0, /* level */
+ GLX_NONE_EXT, /* visualRating */
+ 0, /* transparentPixel */
+ 0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
+ 0 /* transparentIndex */
+ },
+ /* [3] = RGB+Alpha, single buffered, Z, stencil, accum */
+ {
+ -1, /* vid */
+ -1, /* class */
+ True, /* rgba */
+ -1, -1, -1, 8, /* rgba sizes */
+ -1, -1, -1, -1, /* rgba masks */
+ 16, 16, 16, 16, /* rgba accum sizes */
+ False, /* doubleBuffer */
+ False, /* stereo */
+ -1, /* bufferSize */
+ 16, /* depthSize */
+ 8, /* stencilSize */
+ 0, /* auxBuffers */
+ 0, /* level */
+ GLX_NONE_EXT, /* visualRating */
+ 0, /* transparentPixel */
+ 0, 0, 0, 0, /* transparent rgba color (floats scaled to ints) */
+ 0 /* transparentIndex */
+ },
+ /* [4] = CI, double buffered, Z */
{
-1, /* vid */
-1, /* class */
- False, /* color index */
+ False, /* rgba? (false = color index) */
-1, -1, -1, 0, /* rgba sizes */
-1, -1, -1, 0, /* rgba masks */
0, 0, 0, 0, /* rgba accum sizes */
diff --git a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
index 302f9a2e5..07430ae10 100644
--- a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.5 2002/06/02 01:21:14 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -14,7 +14,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaACBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc"
diff --git a/xc/programs/Xserver/GL/mesa/src/math/Imakefile b/xc/programs/Xserver/GL/mesa/src/math/Imakefile
index 0243d0207..ff5741395 100644
--- a/xc/programs/Xserver/GL/mesa/src/math/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/math/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.5 2002/06/02 01:21:15 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -14,7 +14,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaMathBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/math/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/math/Imakefile.inc"
diff --git a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
index 6e1040b35..808fe5a3f 100644
--- a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.5 2002/06/02 01:21:15 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -14,7 +14,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaSwrastBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/swrast/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/swrast/Imakefile.inc"
diff --git a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
index f90f1425e..b822adea8 100644
--- a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.5 2002/06/02 01:21:16 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -14,7 +14,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaSwrastSetupBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc"
diff --git a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
index fc126244b..f5b625be4 100644
--- a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.5 2002/06/02 01:21:16 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $
#if DoLoadableServer
#if !BuildModuleInSubdir
@@ -14,7 +14,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaTnlBuildDir /**/
-#if !BuildModuleInSubdir || !defined(IHaveModules)
+#if !defined(IHaveModules) || !BuildModuleInSubdir
#include "../../../../../../lib/GL/mesa/src/tnl/Imakefile.inc"
#else
#include "../../../../../../../lib/GL/mesa/src/tnl/Imakefile.inc"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 07:11:03 +0000