summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/default4
-rw-r--r--docs/intro.html11
-rw-r--r--docs/relnotes-9.0.html (renamed from docs/relnotes-8.1.html)15
-rw-r--r--src/mesa/main/version.h6
4 files changed, 26 insertions, 10 deletions
diff --git a/configs/default b/configs/default
index 1f167b58e06..85a863f3081 100644
--- a/configs/default
+++ b/configs/default
@@ -8,8 +8,8 @@
CONFIG_NAME = default
# Version info
-MESA_MAJOR=8
-MESA_MINOR=1
+MESA_MAJOR=9
+MESA_MINOR=0
MESA_TINY=0
MESA_VERSION = $(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY)
diff --git a/docs/intro.html b/docs/intro.html
index ef04f357ed9..3f21b935386 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -166,6 +166,17 @@ of the OpenGL specification is implemented.
</p>
+<h2>Version 9.x features</h2>
+<p>
+Version 9.x of Mesa implements the OpenGL 3.1 API.
+While the driver for Intel Sandy Bridge and Ivy Bridge is the only
+driver to support OpenGL 3.1, many developers across the open-source
+community contributed features required for OpenGL 3.1. The primary
+features added since the Mesa 8.0 release are
+GL_ARB_texture_buffer_object and GL_ARB_uniform_buffer_object.
+</p>
+
+
<h2>Version 8.x features</h2>
<p>
Version 8.x of Mesa implements the OpenGL 3.0 API.
diff --git a/docs/relnotes-8.1.html b/docs/relnotes-9.0.html
index 8d27c6663ca..f8b993ac335 100644
--- a/docs/relnotes-8.1.html
+++ b/docs/relnotes-9.0.html
@@ -7,15 +7,20 @@
</head>
<body>
-<h1>Mesa 8.1 Release Notes / date TBD</h1>
+<h1>Mesa 9.0 Release Notes / date TBD</h1>
<p>
-Mesa 8.1 is a new development release.
+Mesa 9.0 is a new development release.
+People who are concerned with stability and reliability should stick
+with a previous release or wait for Mesa 9.0.1.
</p>
<p>
-Mesa 8.1 implements the OpenGL 3.0 API, but the version reported by
-glGetString(GL_VERSION) depends on the particular driver being used.
-Some drivers don't support all the features required in OpenGL 3.0.
+Mesa 9.0 implements the OpenGL 3.1 API, but the version reported by
+glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
+glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
+Some drivers don't support all the features required in OpenGL 3.1. OpenGL
+3.1 is <strong>only</strong> available if requested at context creation
+because GL_ARB_compatibility is not supported.
</p>
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 94a9855d981..5b2e85afd53 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -32,10 +32,10 @@ struct gl_context;
/* Mesa version */
-#define MESA_MAJOR 8
-#define MESA_MINOR 1
+#define MESA_MAJOR 9
+#define MESA_MINOR 0
#define MESA_PATCH 0
-#define MESA_VERSION_STRING "8.1-devel"
+#define MESA_VERSION_STRING "9.0-devel"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))