summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-09-23 16:10:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-09-23 16:10:02 +0000
commita573803ed3fe9ef6489f45bd4c5455b77cb33a43 (patch)
treeec63d356c429ae960d32430a5acbc74b119f93fe /src
parent78a03d3c455fec1ce5c26edec6016a6806d437b8 (diff)
updates for Mesa 4.0
Diffstat (limited to 'src')
-rw-r--r--src/mesa/Makefile.X114
-rw-r--r--src/mesa/drivers/svga/svgamesa.c3
-rw-r--r--src/mesa/drivers/x11/fakeglx.c12
-rw-r--r--src/mesa/main/Makefile.X114
-rw-r--r--src/mesa/main/get.c8
5 files changed, 16 insertions, 15 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index b5cc095a53..6d13089aa1 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
# Mesa 3-D graphics library
-# Version: 3.5.1
+# Version: 4.0
# Copyright (C) 1995-2001 Brian Paul
# Makefile for core library
diff --git a/src/mesa/drivers/svga/svgamesa.c b/src/mesa/drivers/svga/svgamesa.c
index a808241998..db97d20194 100644
--- a/src/mesa/drivers/svga/svgamesa.c
+++ b/src/mesa/drivers/svga/svgamesa.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa.c,v 1.15 2001/03/19 02:25:36 keithw Exp $ */
+/* $Id: svgamesa.c,v 1.16 2001/09/23 16:11:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -430,6 +430,7 @@ SVGAMesaContext SVGAMesaCreateContext( GLboolean doubleBuffer )
(void *) ctx, GL_TRUE );
_mesa_enable_sw_extensions(ctx->gl_ctx);
+ _mesa_enable_1_3_extensions(ctx->gl_ctx);
ctx->gl_buffer = _mesa_create_framebuffer( ctx->gl_vis,
ctx->gl_vis->depthBits > 0,
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 7309fb8ad8..80666aae4d 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,10 +1,10 @@
-/* $Id: fakeglx.c,v 1.57 2001/09/14 02:43:04 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.58 2001/09/23 16:11:27 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 4.0
*
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2001 Brian Paul 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"),
@@ -57,7 +57,7 @@
/* This indicates the client-side GLX API and GLX encoder version. */
#define CLIENT_MAJOR_VERSION 1
-#define CLIENT_MINOR_VERSION 2 /* don't have 1.3's pbuffers, etc yet */
+#define CLIENT_MINOR_VERSION 4 /* but don't have 1.3's pbuffers, etc yet */
/* This indicates the server-side GLX decoder version.
* GLX 1.4 indicates OpenGL 1.3 support
@@ -66,7 +66,7 @@
#define SERVER_MINOR_VERSION 4
/* This is appended onto the glXGetClient/ServerString version strings. */
-#define MESA_GLX_VERSION "Mesa 3.5.1"
+#define MESA_GLX_VERSION "Mesa 4.0"
/* Who implemented this GLX? */
#define VENDOR "Brian Paul"
@@ -1698,7 +1698,7 @@ Fake_glXGetClientString( Display *dpy, int name )
/* XXX Move this when done.
* Create an XMesaBuffer as a Pbuffer.
- * New in Mesa 3.5.1 but untested.
+ * New in Mesa 4.0 but untested.
*/
extern XMesaBuffer XMesaCreatePBuffer( XMesaVisual v, XMesaColormap cmap,
unsigned int width, unsigned int height );
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index b5cc095a53..6d13089aa1 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
+# $Id: Makefile.X11,v 1.58 2001/09/23 16:11:26 brianp Exp $
# Mesa 3-D graphics library
-# Version: 3.5.1
+# Version: 4.0
# Copyright (C) 1995-2001 Brian Paul
# Makefile for core library
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index f466107fdc..efc95ecd85 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,8 +1,8 @@
-/* $Id: get.c,v 1.68 2001/09/18 16:16:21 kschultz Exp $ */
+/* $Id: get.c,v 1.69 2001/09/23 16:11:26 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 4.0
*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
@@ -5310,8 +5310,8 @@ _mesa_GetString( GLenum name )
GET_CURRENT_CONTEXT(ctx);
static const char *vendor = "Brian Paul";
static const char *renderer = "Mesa";
- static const char *version_1_2 = "1.2 Mesa 3.5.1";
- static const char *version_1_3 = "1.3 Mesa 3.5.1";
+ static const char *version_1_2 = "1.2 Mesa 4.0";
+ static const char *version_1_3 = "1.3 Mesa 4.0";
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);