On 08/30/2012 04:35 PM, Ian Romanick wrote:
From: Ian Romanick<[email protected]>
Now that OpenGL 3.1 is supported by at least one driver, follow
tradition and bump the major version number.
Signed-off-by: Ian Romanick<[email protected]>
---
configs/default | 4 +--
docs/intro.html | 11 ++++++++
docs/relnotes-8.1.html | 70 ---------------------------------------------
docs/relnotes-9.0.html | 75 +++++++++++++++++++++++++++++++++++++++++++++++++
src/mesa/main/version.h | 6 ++--
5 files changed, 91 insertions(+), 75 deletions(-)
delete mode 100644 docs/relnotes-8.1.html
create mode 100644 docs/relnotes-9.0.html
diff --git a/configs/default b/configs/default
index 1f167b5..85a863f 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 ef04f35..3f21b93 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-8.1.html
deleted file mode 100644
index 8d27c66..0000000
--- a/docs/relnotes-8.1.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
-<html lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<title>Mesa Release Notes</title>
-<link rel="stylesheet" type="text/css" href="mesa.css">
-</head>
-<body>
-
-<h1>Mesa 8.1 Release Notes / date TBD</h1>
-
-<p>
-Mesa 8.1 is a new development release.
-</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.
-</p>
-
-
-<h2>MD5 checksums</h2>
-<pre>
-tbd
-</pre>
-
-
-<h2>New features</h2>
-
-<p>
-Note: some of the new features are only available with certain drivers.
-</p>
-
-<ul>
-<li>GL_ARB_base_instance</li>
-<li>GL_ARB_blend_func_extended</li>
-<li>GL_ARB_debug_output</li>
-<li>GL_ARB_invalidate_subdate - Currently a "no-op" implementation. This
-extension is always enabled in all drivers.</li>
-<li>GL_ARB_shader_bit_encoding</li>
-<li>GL_ARB_timer_query</li>
-<li>GL_ARB_transform_feedback3</li>
-<li>GL_ARB_transform_feedback_instanced</li>
-<li>GL_EXT_unpack_subimage for ES 2.0</li>
-<li>GL_EXT_read_format_bgra for ES 1.1 and 2.0</li>
-<li>GL_EXT_texture_rg for ES 2.x</li>
-<li>GL_NV_read_buffer for ES 2.0</li>
-<li>EGL_KHR_create_context</li>
-<li>EGL_KHR_surfaceless_context - This replaces the
-EGL_KHR_surfaceless_{gles1,gles2,opengl} extensions that were never approved
-by Khronos.</li>
-<li>EGL_EXT_create_context_robustness</li>
-</ul>
-
-
-<h2>Bug fixes</h2>
-
-<p>TBD -- This list is likely incomplete.</p>
-
-
-<h2>Changes</h2>
-
-<p>
-The legacy/static Makefile system (ex: 'make linux-dri') has been removed.
-The two supported build methods are now autoconf/automake and SCons.
-</p>
-
-
-</body>
-</html>
diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
new file mode 100644
index 0000000..f8b993a
--- /dev/null
+++ b/docs/relnotes-9.0.html
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<title>Mesa Release Notes</title>
+<link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<h1>Mesa 9.0 Release Notes / date TBD</h1>
+
+<p>
+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 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>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+tbd
+</pre>
+
+
+<h2>New features</h2>
+
+<p>
+Note: some of the new features are only available with certain drivers.
+</p>
+
+<ul>
+<li>GL_ARB_base_instance</li>
+<li>GL_ARB_blend_func_extended</li>
+<li>GL_ARB_debug_output</li>
+<li>GL_ARB_invalidate_subdate - Currently a "no-op" implementation. This
+extension is always enabled in all drivers.</li>
+<li>GL_ARB_shader_bit_encoding</li>
+<li>GL_ARB_timer_query</li>
+<li>GL_ARB_transform_feedback3</li>
+<li>GL_ARB_transform_feedback_instanced</li>
+<li>GL_EXT_unpack_subimage for ES 2.0</li>
+<li>GL_EXT_read_format_bgra for ES 1.1 and 2.0</li>
+<li>GL_EXT_texture_rg for ES 2.x</li>
+<li>GL_NV_read_buffer for ES 2.0</li>
+<li>EGL_KHR_create_context</li>
+<li>EGL_KHR_surfaceless_context - This replaces the
+EGL_KHR_surfaceless_{gles1,gles2,opengl} extensions that were never approved
+by Khronos.</li>
+<li>EGL_EXT_create_context_robustness</li>
+</ul>
+
+
+<h2>Bug fixes</h2>
+
+<p>TBD -- This list is likely incomplete.</p>
+
+
+<h2>Changes</h2>
+
+<p>
+The legacy/static Makefile system (ex: 'make linux-dri') has been removed.
+The two supported build methods are now autoconf/automake and SCons.
+</p>
+
+
+</body>
+</html>
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 94a9855..5b2e85a 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))
For both patches:
Reviewed-by: Brian Paul <[email protected]>
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
