diff options
| author | brianp <brianp> | 2001-02-12 20:42:41 +0000 |
|---|---|---|
| committer | brianp <brianp> | 2001-02-12 20:42:41 +0000 |
| commit | 653cde8ff896c981d65e436159180f7703f1f34e (patch) | |
| tree | ab366fadcb604e6415c28f05916e9c62a2223d2a /xc/extras/Mesa/src/X | |
| parent | 7da70ab795a6c27cd0cabc61db3a750c59f51053 (diff) | |
sync with Mesa 3.4.1 CVS
Diffstat (limited to 'xc/extras/Mesa/src/X')
| -rw-r--r-- | xc/extras/Mesa/src/X/fakeglx.c | 2 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/X/xfonts.c | 5 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/X/xmesa1.c | 4 | ||||
| -rw-r--r-- | xc/extras/Mesa/src/X/xmesaP.h | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/xc/extras/Mesa/src/X/fakeglx.c b/xc/extras/Mesa/src/X/fakeglx.c index 6c9f04aee..36b14fea0 100644 --- a/xc/extras/Mesa/src/X/fakeglx.c +++ b/xc/extras/Mesa/src/X/fakeglx.c @@ -64,7 +64,7 @@ #define SERVER_MINOR_VERSION 3 /* This is appended onto the glXGetClient/ServerString version strings. */ -#define MESA_GLX_VERSION "Mesa 3.4" +#define MESA_GLX_VERSION "Mesa 3.4.1" /* Who implemented this GLX? */ #define VENDOR "Brian Paul" diff --git a/xc/extras/Mesa/src/X/xfonts.c b/xc/extras/Mesa/src/X/xfonts.c index b56d2471a..005ee3912 100644 --- a/xc/extras/Mesa/src/X/xfonts.c +++ b/xc/extras/Mesa/src/X/xfonts.c @@ -33,6 +33,11 @@ #include "conf.h" #endif +#ifdef VMS +#include <GL/vms_x_fix.h> +#endif + + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/xc/extras/Mesa/src/X/xmesa1.c b/xc/extras/Mesa/src/X/xmesa1.c index 7afff16b2..78eb21901 100644 --- a/xc/extras/Mesa/src/X/xmesa1.c +++ b/xc/extras/Mesa/src/X/xmesa1.c @@ -2,7 +2,7 @@ /* * Mesa 3-D graphics library * Version: 3.4 - * + * * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -2512,7 +2512,7 @@ const char *XMesaGetString( XMesaContext c, int name ) { (void) c; if (name==XMESA_VERSION) { - return "3.4"; + return "3.4.1"; } else if (name==XMESA_EXTENSIONS) { return ""; diff --git a/xc/extras/Mesa/src/X/xmesaP.h b/xc/extras/Mesa/src/X/xmesaP.h index 4d7718c53..0886fa3dc 100644 --- a/xc/extras/Mesa/src/X/xmesaP.h +++ b/xc/extras/Mesa/src/X/xmesaP.h @@ -226,7 +226,7 @@ struct xmesa_buffer { /* Used to do XAllocColor/XFreeColors accounting: */ int num_alloced; - Pixel alloced_colors[256]; + unsigned long alloced_colors[256]; #if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) __DRIdrawablePrivate *driDrawPriv; /* back pointer to DRI drawable |