summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-10-29 22:32:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-10-29 22:32:50 +0000
commit9bd8f97ea48baf46fc1d688b15741c192adb5436 (patch)
tree808bb0fdb1b957b9329bf4bec6009ac11cfea455 /src
parent46b3f976542190dd3c217a46653159f77552764a (diff)
update versioning/extensions for OpenGL 1.4 / Mesa 5.0
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c6
-rw-r--r--src/mesa/drivers/windows/wmesa.c3
-rw-r--r--src/mesa/drivers/x11/xm_api.c6
-rw-r--r--src/mesa/main/get.c6
4 files changed, 11 insertions, 10 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index f67047a1cd..f49701375d 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1,8 +1,8 @@
-/* $Id: osmesa.c,v 1.94 2002/10/25 21:06:34 brianp Exp $ */
+/* $Id: osmesa.c,v 1.95 2002/10/29 22:32:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -303,7 +303,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
_mesa_enable_sw_extensions(&(osmesa->gl_ctx));
_mesa_enable_1_3_extensions(&(osmesa->gl_ctx));
- /*_mesa_enable_1_4_extensions(&(osmesa->gl_ctx));*/
+ _mesa_enable_1_4_extensions(&(osmesa->gl_ctx));
osmesa->gl_buffer = _mesa_create_framebuffer( osmesa->gl_visual,
(GLboolean) ( osmesa->gl_visual->depthBits > 0 ),
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 3df9ae1aec..1b8671ebe6 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.41 2002/10/24 23:57:23 brianp Exp $ */
+/* $Id: wmesa.c,v 1.42 2002/10/29 22:32:50 brianp Exp $ */
/*
* Windows (Win32) device driver for Mesa 3.4
@@ -1352,6 +1352,7 @@ WMesaContext WMesaCreateContext( HWND hWnd, HPALETTE* Pal,
_mesa_enable_sw_extensions(c->gl_ctx);
_mesa_enable_1_3_extensions(c->gl_ctx);
+ _mesa_enable_1_4_extensions(c->gl_ctx);
c->gl_buffer = _mesa_create_framebuffer( c->gl_visual,
c->gl_visual->depthBits > 0,
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index c991779433..3ba294e988 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,8 +1,8 @@
-/* $Id: xm_api.c,v 1.47 2002/10/25 21:06:34 brianp Exp $ */
+/* $Id: xm_api.c,v 1.48 2002/10/29 22:32:51 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.0.2
+ * Version: 5.0
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -1637,7 +1637,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
_mesa_enable_sw_extensions(ctx);
_mesa_enable_1_3_extensions(ctx);
- /*_mesa_enable_1_4_extensions(ctx);*/
+ _mesa_enable_1_4_extensions(ctx);
if (CHECK_BYTE_ORDER(v)) {
c->swapbytes = GL_FALSE;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 0d3db871da..7513ffa16a 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,8 +1,8 @@
-/* $Id: get.c,v 1.97 2002/10/24 23:57:20 brianp Exp $ */
+/* $Id: get.c,v 1.98 2002/10/29 22:32:50 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 4.1
+ * Version: 5.0
*
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
*
@@ -5630,7 +5630,7 @@ _mesa_GetString( GLenum name )
static const char *renderer = "Mesa";
static const char *version_1_2 = "1.2 Mesa 4.1";
static const char *version_1_3 = "1.3 Mesa 4.1";
- static const char *version_1_4 = "1.3 Mesa 4.1"; /* change to 1.4 in 5.0 */
+ static const char *version_1_4 = "1.4 Mesa 5.0";
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);