Makefile | 8 ++++----
docs/news.html | 7 +++++++
docs/relnotes-7.0.3.html | 3 ++-
src/mesa/drivers/fbdev/glfbdev.c | 5 +++++
src/mesa/main/state.c | 2 +-
src/mesa/main/version.h | 2 +-
src/mesa/shader/arbprogram.c | 4 ++--
src/mesa/shader/arbprogram.syn | 6 +++---
src/mesa/shader/arbprogram_syn.h | 6 +++---
9 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 48616e71d219258c8ca07eb067214eb9eea277b4
Author: Brian <[EMAIL PROTECTED]>
Date: Fri Apr 4 19:06:30 2008 -0600
final prep/changes for 7.0.3 release
diff --git a/Makefile b/Makefile
index 0f58f4b..f0134e2 100644
--- a/Makefile
+++ b/Makefile
@@ -167,10 +167,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.0.3-rc3
-LIB_NAME = MesaLib-7.0.3-rc3
-DEMO_NAME = MesaDemos-7.0.3-rc3
-GLUT_NAME = MesaGLUT-7.0.3-rc3
+DIRECTORY = Mesa-7.0.3
+LIB_NAME = MesaLib-7.0.3
+DEMO_NAME = MesaDemos-7.0.3
+GLUT_NAME = MesaGLUT-7.0.3
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
diff --git a/docs/news.html b/docs/news.html
index 13e43f1..c68f186 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -11,6 +11,13 @@
<H1>News</H1>
+<h2>April 4, 2008</h2>
+<p>
+<a href="relnotes-7.0.3.html">Mesa 7.0.3</a> is released.
+This is a bug-fix release.
+</p>
+
+
<h2>November 13, 2007</h2>
<p>
diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index 0f365af..0b8a56f 100644
--- a/docs/relnotes-7.0.3.html
+++ b/docs/relnotes-7.0.3.html
@@ -8,7 +8,7 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 7.0.3 Release Notes / March TBD, 2008</H1>
+<H1>Mesa 7.0.3 Release Notes / April 4, 2008</H1>
<p>
Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index ce6e202..0bf7557 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
#define MESA_MAJOR 7
#define MESA_MINOR 0
#define MESA_PATCH 3
-#define MESA_VERSION_STRING "7.0.3-rc3"
+#define MESA_VERSION_STRING "7.0.3"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 70d227ac624e4b1e6dfecfe8778ef77cbab355e7
Author: Brian <[EMAIL PROTECTED]>
Date: Tue Apr 1 18:04:13 2008 -0600
7.0.3 release candidate 3
diff --git a/Makefile b/Makefile
index 025f223..0f58f4b 100644
--- a/Makefile
+++ b/Makefile
@@ -167,10 +167,10 @@ ultrix-gcc:
# Rules for making release tarballs
-DIRECTORY = Mesa-7.0.3-rc2
-LIB_NAME = MesaLib-7.0.3-rc2
-DEMO_NAME = MesaDemos-7.0.3-rc2
-GLUT_NAME = MesaGLUT-7.0.3-rc2
+DIRECTORY = Mesa-7.0.3-rc3
+LIB_NAME = MesaLib-7.0.3-rc3
+DEMO_NAME = MesaDemos-7.0.3-rc3
+GLUT_NAME = MesaGLUT-7.0.3-rc3
MAIN_FILES = \
$(DIRECTORY)/Makefile* \
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 12ca583..ce6e202 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -31,7 +31,7 @@
#define MESA_MAJOR 7
#define MESA_MINOR 0
#define MESA_PATCH 3
-#define MESA_VERSION_STRING "7.0.3-rc2"
+#define MESA_VERSION_STRING "7.0.3-rc3"
/* To make version comparison easy */
#define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
commit 7f2c4f96f502e5969fd251ad50a113c3a566686d
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Tue Jan 15 15:08:34 2008 -0800
Bug #13492: Only call ProgramStringNotify if program parsing succeeded.
Wine intentionally tries some out-of-spec programs to test strictness, and
calling ProgramStringNotify on the results of a failed program parse
resulted
in crashes in the 965 driver.
(cherry picked from commit 185320ae13163995ea61e38104ab5aeaeb28d8e5)
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 4b5f63e..ee75be3 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -229,7 +229,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format,
GLsizei len,
struct gl_vertex_program *prog = ctx->VertexProgram.Current;
_mesa_parse_arb_vertex_program(ctx, target, string, len, prog);
- if (ctx->Driver.ProgramStringNotify)
+ if (ctx->Program.ErrorPos == -1 && ctx->Driver.ProgramStringNotify)
ctx->Driver.ProgramStringNotify( ctx, target, &prog->Base );
}
else if (target == GL_FRAGMENT_PROGRAM_ARB
@@ -237,7 +237,7 @@ _mesa_ProgramStringARB(GLenum target, GLenum format,
GLsizei len,
struct gl_fragment_program *prog = ctx->FragmentProgram.Current;
_mesa_parse_arb_fragment_program(ctx, target, string, len, prog);
- if (ctx->Driver.ProgramStringNotify)
+ if (ctx->Program.ErrorPos == -1 && ctx->Driver.ProgramStringNotify)
ctx->Driver.ProgramStringNotify( ctx, target, &prog->Base );
}
else {
commit 667f0f60fc4f3f043449bbf98769d478d90f7b4e
Author: Roland Scheidegger <[EMAIL PROTECTED]>
Date: Tue Apr 1 23:25:04 2008 +0200
fix mistakenly set ATIFragmentShader._Enabled bit (bug 15269)
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 99b3f48..8266e45 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -960,7 +960,7 @@ update_program(GLcontext *ctx)
ctx->FragmentProgram._Enabled = ctx->FragmentProgram.Enabled
&& ctx->FragmentProgram.Current->Base.Instructions;
ctx->ATIFragmentShader._Enabled = ctx->ATIFragmentShader.Enabled
- && ctx->ATIFragmentShader.Current->Instructions;
+ && ctx->ATIFragmentShader.Current->Instructions[0];
/*
* Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
commit 7592b8cc102312c7499528517239903fe5d3e1a7
Author: Brian <[EMAIL PROTECTED]>
Date: Tue Apr 1 08:41:24 2008 -0600
added some missing calls to _mesa_enable_x_y_extensions()
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 6c6511b..994319a 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -795,6 +795,11 @@ glFBDevCreateContext( const GLFBDevVisualPtr visual,
GLFBDevContextPtr share )
}
_mesa_enable_sw_extensions(glctx);
+ _mesa_enable_1_3_extensions(glctx);
+ _mesa_enable_1_4_extensions(glctx);
+ _mesa_enable_1_5_extensions(glctx);
+ _mesa_enable_2_0_extensions(glctx);
+ _mesa_enable_2_1_extensions(glctx);
return ctx;
}
commit f55b831859fcd01810713205659b4045d194a99c
Author: Brian <[EMAIL PROTECTED]>
Date: Mon Mar 31 14:59:46 2008 -0600
fix ARB f/v program comment parsing bug
diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index 212467d..0f365af 100644
--- a/docs/relnotes-7.0.3.html
+++ b/docs/relnotes-7.0.3.html
@@ -42,6 +42,7 @@ Mesa 7.0.3 is a stable release with bug fixes since version
7.0.2.
<li>state.texenv.color state var didn't work in GL_ARB_fragment_program (bug
14931)
<li>glBitmap from a PBO didn't always work
<li>glGetTexImage into a PBO didn't always work
+<li>Comments at the end of ARB vertex/fragment programs crashed the parser
</ul>
<h2>Changes</h2>
commit 217f7f7e5d253550ca028b9696a4155d801733cb
Author: Markus Amsler <[EMAIL PROTECTED]>
Date: Mon Mar 31 14:58:20 2008 -0600
fix parsing bug involving comments at the end of ARB v/f programs
diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn
index 2aa5551..ccf047d 100644
--- a/src/mesa/shader/arbprogram.syn
+++ b/src/mesa/shader/arbprogram.syn
@@ -2605,14 +2605,14 @@ white_char
' ' .or '\t' .or '\n' .or '\r';
comment_block
- '#' .and .loop comment_char .and new_line;
+ '#' .and .loop comment_char .and optional_new_line;
/* All ASCII characters except '\r', '\n' and '\0' */
comment_char
'\x0E'-'\xFF' .or '\x01'-'\x09' .or '\x0B'-'\x0C';
-new_line
- '\n' .or crlf .or '\0';
+optional_new_line
+ '\n' .or crlf .or .true;
crlf
'\r' .and '\n';
diff --git a/src/mesa/shader/arbprogram_syn.h b/src/mesa/shader/arbprogram_syn.h
index 3904870..106fa5b 100644
--- a/src/mesa/shader/arbprogram_syn.h
+++ b/src/mesa/shader/arbprogram_syn.h
@@ -1223,11 +1223,11 @@
"white_char\n"
" ' ' .or '\\t' .or '\\n' .or '\\r';\n"
"comment_block\n"
-" '#' .and .loop comment_char .and new_line;\n"
+" '#' .and .loop comment_char .and optional_new_line;\n"
"comment_char\n"
" '\\x0E'-'\\xFF' .or '\\x01'-'\\x09' .or '\\x0B'-'\\x0C';\n"
-"new_line\n"
-" '\\n' .or crlf .or '\\0';\n"
+"optional_new_line\n"
+" '\\n' .or crlf .or .true;\n"
"crlf\n"
" '\\r' .and '\\n';\n"
"semicolon\n"
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
