Prepare changelog for upload

New upstream release
Merge tag 'mesa_7_0_3' into debian-unstable
2008-04-11 08:42:55 +02:00 · 2008-04-11 08:41:32 +02:00 · 2008-04-11 08:38:26 +02:00 · 2008-04-04 19:06:30 -06:00 · 2008-04-01 18:04:13 -06:00 · 2008-04-01 16:27:48 -07:00
10 changed files with 36 additions and 15 deletions
--- a/8
+++ b/8
@@ -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
+LIB_NAME = MesaLib-7.0.3
+DEMO_NAME = MesaDemos-7.0.3
+GLUT_NAME = MesaGLUT-7.0.3

 MAIN_FILES = \
 	$(DIRECTORY)/Makefile*						\
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Only call ProgramStringNotify if program parsing succeeded,
+    closes: #473551.
+
+ -- Brice Goglin <bgoglin@debian.org>  Fri, 11 Apr 2008 08:42:37 +0200
+
 mesa (7.0.3~rc2-2) unstable; urgency=low

  * Pull from mesa_7_0_branch (1e83d70b).
--- 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>
--- 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.
@@ -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>
--- 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;
 }
--- 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
--- 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"

 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
--- 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 {
--- 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';
--- 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"
Author	SHA1	Message	Date
Brice Goglin	59c9c40c01	Prepare changelog for upload	2008-04-11 08:42:55 +02:00
Brice Goglin	666e0635da	New upstream release	2008-04-11 08:41:32 +02:00
Brice Goglin	f9968a0346	Merge tag 'mesa_7_0_3' into debian-unstable	2008-04-11 08:38:26 +02:00
Brian	48616e71d2	final prep/changes for 7.0.3 release	2008-04-04 19:06:30 -06:00
Brian	70d227ac62	7.0.3 release candidate 3	2008-04-01 18:04:13 -06:00
Eric Anholt	7f2c4f96f5	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 `185320ae13`)	2008-04-01 16:27:48 -07:00
Roland Scheidegger	667f0f60fc	fix mistakenly set ATIFragmentShader._Enabled bit (bug 15269)	2008-04-01 23:25:04 +02:00
Brian	7592b8cc10	added some missing calls to _mesa_enable_x_y_extensions()	2008-04-01 08:41:24 -06:00
Brian	f55b831859	fix ARB f/v program comment parsing bug	2008-03-31 15:00:18 -06:00
Markus Amsler	217f7f7e5d	fix parsing bug involving comments at the end of ARB v/f programs	2008-03-31 15:00:18 -06:00