diff options
| -rw-r--r-- | Make-config | 6 | ||||
| -rw-r--r-- | Makefile.X11 | 14 | ||||
| -rw-r--r-- | docs/RELNOTES-6.0 | 84 | ||||
| -rw-r--r-- | docs/VERSIONS | 8 | ||||
| -rw-r--r-- | src/mesa/Makefile.OSMesa16 | 2 | ||||
| -rw-r--r-- | src/mesa/Makefile.X11 | 2 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/version.h | 14 |
8 files changed, 114 insertions, 22 deletions
diff --git a/Make-config b/Make-config index 85d9b66000..e544cf3d97 100644 --- a/Make-config +++ b/Make-config @@ -8,8 +8,8 @@ # new platform support to the bin/mklib script. -MESA_MAJOR=5 -MESA_MINOR=1 +MESA_MAJOR=6 +MESA_MINOR=0 MESA_TINY=0 VERSION=$(MESA_MAJOR).$(MESA_MINOR) @@ -1093,7 +1093,7 @@ linux-debug: "GLU_LIB_DEPS = -L$(TOP)/lib -lGL -lm" \ "GLUT_LIB_DEPS = -L$(TOP)/lib -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm" \ "GLW_LIB_DEPS = -L$(TOP)/lib -lGL -L/usr/X11R6/lib -lXt -lX11" \ - "APP_LIB_DEPS = -lglut -lGLU -lGL" + "APP_LIB_DEPS = -L$(TOP)/lib -lglut -lGLU -lGL" linux-x86-debug: $(MAKE) $(MFLAGS) -f Makefile.X11 targets \ diff --git a/Makefile.X11 b/Makefile.X11 index f45e21117b..0f5e620eb5 100644 --- a/Makefile.X11 +++ b/Makefile.X11 @@ -1,9 +1,9 @@ -# $Id: Makefile.X11,v 1.103 2003/12/19 11:26:46 dborca Exp $ +# $Id: Makefile.X11,v 1.104 2003/12/21 04:06:31 brianp Exp $ # Mesa 3-D graphics library -# Version: 5.1 +# Version: 6.0 # -# Copyright (C) 1999-2003 Brian Paul All Rights Reserved. +# Copyright (C) 1999-2004 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"), @@ -472,10 +472,10 @@ cvsclean: realclean -DIRECTORY = Mesa-5.1 -LIB_NAME = MesaLib-5.1 -DEMO_NAME = MesaDemos-5.1 -GLU_NAME = MesaGLU-5.1 +DIRECTORY = Mesa-6.0 +LIB_NAME = MesaLib-6.0 +DEMO_NAME = MesaDemos-6.0 +GLU_NAME = MesaGLU-6.0 GLUT_NAME = GLUT-3.7 diff --git a/docs/RELNOTES-6.0 b/docs/RELNOTES-6.0 new file mode 100644 index 0000000000..73208dbe94 --- /dev/null +++ b/docs/RELNOTES-6.0 @@ -0,0 +1,84 @@ + + Mesa 6.0 release notes + + January ??, 2004 + + PLEASE READ!!!! + + + +Introduction +------------ + +Mesa uses an even/odd version number scheme like the Linux kernel. +Odd numbered versions (such as 5.1) designate new developmental releases. +Even numbered versions (such as 6.0) designate stable releases. + +Mesa version 6.0 signifies two things: + + 1. A stabilization of the 5.1 development release + 2. Implementation of the OpenGL 1.5 specification + + +Note that the Mesa major version number is incremented with the OpenGL +minor version number: + + Mesa 1.x == OpenGL 1.0 + Mesa 2.x == OpenGL 1.1 + Mesa 3.x == OpenGL 1.2 + Mesa 4.x == OpenGL 1.3 + Mesa 5.x == OpenGL 1.4 + Mesa 6.x == OpenGL 1.5 + + + +New Features +------------ + +Mesa 5.1 already had all the new features of OpenGL 1.5, implemented as +extensions. These extensions were simply promoted to standard features: + + GL_ARB_occlusion_query extension + GL_ARB_texture_non_power_of_two extension + GL_ARB_vertex_buffer_object extension + + + +Device Drivers +-------------- + +Mesa advertises itself as either OpenGL 1.2 or OpenGL 1.3 depending on +the device driver. For example, if the driver enables all the ARB +extensions which are part of OpenGL 1.3 then glGetString(GL_VERSION) +will return "1.3". Otherwise, it'll return "1.2". + +A number of Mesa's software drivers haven't been actively maintained for +some time. We rely on volunteers to maintain many of the drivers. +Here's the current status of all included drivers: + + +Driver Status +---------------------- --------------------- +XMesa (Xlib) implements OpenGL 1.5 +OSMesa (off-screen) implements OpenGL 1.5 +FX (3dfx Voodoo1/2) implements OpenGL 1.3 +SVGA implements OpenGL 1.3 +Wind River UGL implements OpenGL 1.3 +Windows/Win32 implements OpenGL 1.5 +DJGPP implements OpenGL 1.5 +GGI implements OpenGL 1.3 +BeOS implements OpenGL 1.5 +Allegro needs updating +D3D needs updating + + + + +Other Changes +------------- + +See the VERSIONS file for more details about bug fixes, etc. in Mesa 6.0. + + +---------------------------------------------------------------------- +$Id: RELNOTES-6.0,v 1.1 2003/12/21 04:06:31 brianp Exp $ diff --git a/docs/VERSIONS b/docs/VERSIONS index 3066633621..aeb6e5b91a 100644 --- a/docs/VERSIONS +++ b/docs/VERSIONS @@ -1184,3 +1184,11 @@ Mesa Version History - glxgears.c demo updated to use GLX swap rate extensions - glTexImage1/2/3D now allows width/height/depth = 0 - disable SPARC asm code on Linux (bug 852204) + + +6.0 January ??, 2004 + New: + - full OpenGL 1.5 support + Bug fixes: + - fragment program dot product? + diff --git a/src/mesa/Makefile.OSMesa16 b/src/mesa/Makefile.OSMesa16 index 7417e2d82c..4963ec47ed 100644 --- a/src/mesa/Makefile.OSMesa16 +++ b/src/mesa/Makefile.OSMesa16 @@ -9,7 +9,7 @@ TOP = ../.. GL_MAJOR = 1 -GL_MINOR = 4 +GL_MINOR = 5 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) OSMESA_LIB_NAME = "OSMesa16" # may be overridden in Make-config diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11 index 7a0e82c86e..1fd6f204ed 100644 --- a/src/mesa/Makefile.X11 +++ b/src/mesa/Makefile.X11 @@ -6,7 +6,7 @@ TOP = ../.. GL_MAJOR = 1 -GL_MINOR = 4 +GL_MINOR = 5 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY) GL_LIB_NAME = "GL" # may be overridden in Make-config diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 32491d9d34..cec9892106 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -5,9 +5,9 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.0 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -6380,7 +6380,7 @@ _mesa_GetString( GLenum name ) static const char *version_1_2 = "1.2 Mesa " MESA_VERSION_STRING; static const char *version_1_3 = "1.3 Mesa " MESA_VERSION_STRING; static const char *version_1_4 = "1.4 Mesa " MESA_VERSION_STRING; - static const char *version_1_5 = "1.4 Mesa " MESA_VERSION_STRING; + static const char *version_1_5 = "1.5 Mesa " MESA_VERSION_STRING; ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 371a6e59a1..7871e55b1b 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.0 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 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"), @@ -28,10 +28,10 @@ /* Mesa version */ -#define MESA_MAJOR 5 -#define MESA_MINOR 1 +#define MESA_MAJOR 6 +#define MESA_MINOR 0 #define MESA_PATCH 0 -#define MESA_VERSION_STRING "5.1" +#define MESA_VERSION_STRING "6.0" /* To make version comparison easy */ #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) @@ -40,9 +40,9 @@ /* OpenGL API version */ #define OPENGL_MAJOR 1 -#define OPENGL_MINOR 4 +#define OPENGL_MINOR 5 #define OPENGL_PATCH 0 -#define OPENGL_VERSION_STRING "1.4" +#define OPENGL_VERSION_STRING "1.5" /* To make version comparison easy */ #define OPENGL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |