From 1e83d70b6d07c7d3c61ee0ddf0de9420c167175d Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Mon, 31 Mar 2008 09:34:25 +0800
Subject: i965: Apply -ve rhw to 965. Fix the regression introduced by commit
 da476ff02dd357d9909a2df9891ee645f5f776a0. (bug#14940)

---
 src/mesa/drivers/dri/i965/brw_clip_util.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c b/src/mesa/drivers/dri/i965/brw_clip_util.c
index fc484a7393..41d9b75e91 100644
--- a/src/mesa/drivers/dri/i965/brw_clip_util.c
+++ b/src/mesa/drivers/dri/i965/brw_clip_util.c
@@ -343,7 +343,7 @@ void brw_clip_init_clipmask( struct brw_clip_compile *c )
       release_tmp(c, tmp);
    }
 
-   if (BRW_IS_IGD(p->brw)) {
+   if (!BRW_IS_IGD(p->brw)) {
        /* Test for -ve rhw workaround 
         */
        brw_set_conditionalmod(p, BRW_CONDITIONAL_NZ);
-- 
cgit v1.2.3


From 217f7f7e5d253550ca028b9696a4155d801733cb Mon Sep 17 00:00:00 2001
From: Markus Amsler <markus.amsler@oribi.org>
Date: Mon, 31 Mar 2008 14:58:20 -0600
Subject: fix parsing bug involving comments at the end of ARB v/f programs

---
 src/mesa/shader/arbprogram.syn   | 6 +++---
 src/mesa/shader/arbprogram_syn.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/shader/arbprogram.syn b/src/mesa/shader/arbprogram.syn
index 2aa5551cf7..ccf047d408 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 3904870a09..106fa5b009 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"
-- 
cgit v1.2.3


From f55b831859fcd01810713205659b4045d194a99c Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 31 Mar 2008 14:59:46 -0600
Subject: fix ARB f/v program comment parsing bug

---
 docs/relnotes-7.0.3.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index 212467d6ff..0f365af10a 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>
-- 
cgit v1.2.3


From 7592b8cc102312c7499528517239903fe5d3e1a7 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 1 Apr 2008 08:41:24 -0600
Subject: added some missing calls to _mesa_enable_x_y_extensions()

---
 src/mesa/drivers/fbdev/glfbdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 6c6511b7e5..994319ab43 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;
 }
-- 
cgit v1.2.3


From 667f0f60fc4f3f043449bbf98769d478d90f7b4e Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Tue, 1 Apr 2008 23:25:04 +0200
Subject: fix mistakenly set ATIFragmentShader._Enabled bit (bug 15269)

---
 src/mesa/main/state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 99b3f48b45..8266e4506f 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
-- 
cgit v1.2.3


From 7f2c4f96f502e5969fd251ad50a113c3a566686d Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Tue, 15 Jan 2008 15:08:34 -0800
Subject: 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)
---
 src/mesa/shader/arbprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 4b5f63ef92..ee75be315e 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 {
-- 
cgit v1.2.3


From 70d227ac624e4b1e6dfecfe8778ef77cbab355e7 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Tue, 1 Apr 2008 18:04:13 -0600
Subject: 7.0.3 release candidate 3

---
 Makefile                | 8 ++++----
 src/mesa/main/version.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 025f223c14..0f58f4b3ec 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 12ca5832ec..ce6e2021e7 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))
-- 
cgit v1.2.3


From 48616e71d219258c8ca07eb067214eb9eea277b4 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 4 Apr 2008 19:06:30 -0600
Subject: final prep/changes for 7.0.3 release

---
 Makefile                 | 8 ++++----
 docs/news.html           | 7 +++++++
 docs/relnotes-7.0.3.html | 2 +-
 src/mesa/main/version.h  | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 0f58f4b3ec..f0134e2da1 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 13e43f1abe..c68f1866f7 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 0f365af10a..0b8a56f6dd 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 ce6e2021e7..0bf7557e90 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))
-- 
cgit v1.2.3


From 4b96a39c48a20ccd5dfe304d5504855410bea7c0 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 4 Apr 2008 19:24:32 -0600
Subject: added MD5 sums for 7.0.3

---
 docs/relnotes-7.0.3.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html
index 0b8a56f6dd..5c8efc79d7 100644
--- a/docs/relnotes-7.0.3.html
+++ b/docs/relnotes-7.0.3.html
@@ -17,6 +17,15 @@ Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2.
 
 <h2>MD5 checksums</h2>
 <pre>
+3fd1cb76531b2515ef7db92d9a93dbf8  MesaLib-7.0.3.tar.gz
+e6e6379d7793af40a6bc3ce1bace572e  MesaLib-7.0.3.tar.bz2
+97882bac195229ee0b78cab82e0e3be1  MesaLib-7.0.3.zip
+8abf6bbcb1661e7dd4ce73b3fbb85898  MesaDemos-7.0.3.tar.gz
+47fd6863621d3c9c7dbb870ab7f0c303  MesaDemos-7.0.3.tar.bz2
+99e442e14da1928f76a7297bb421a3af  MesaDemos-7.0.3.zip
+2b50fe9fadc4709b57c52adef09fce3c  MesaGLUT-7.0.3.tar.gz
+0ff23c4e91b238abae63a5fc9fa003e7  MesaGLUT-7.0.3.tar.bz2
+70e83554a4462dad28e0d6e20f79aada  MesaGLUT-7.0.3.zip
 </pre>
 
 
-- 
cgit v1.2.3


From 4b24d5261ae175b1e49ac1736c0d8171cf441648 Mon Sep 17 00:00:00 2001
From: Hasso Tepper <hasso@estpak.ee>
Date: Wed, 9 Apr 2008 18:59:19 -0600
Subject: patches for DragonFly OS

---
 Makefile                                | 4 ++++
 bin/mklib                               | 6 +++++-
 src/glut/glx/Makefile                   | 2 +-
 src/glw/Makefile                        | 2 +-
 src/mesa/drivers/dri/common/xmlconfig.c | 3 +++
 src/mesa/main/imports.c                 | 2 +-
 src/mesa/x86/common_x86.c               | 4 ++--
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index f0134e2da1..628f64c212 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,10 @@ darwin-fat-32bit \
 darwin-fat-all \
 darwin-static \
 darwin-static-x86ppc \
+dragonfly \
+dragonfly-dri \
+dragonfly-dri-amd64 \
+dragonfly-dri-x86 \
 freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
diff --git a/bin/mklib b/bin/mklib
index 90bf834b43..6d353b2455 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -111,6 +111,10 @@ do
 	    # this is a special case (see bugzilla 10876)
 	    DEPS="$DEPS $1"
 	    ;;
+	-Wl*)
+	    # Another special case for DragonFly
+	    DEPS="$DEPS $1"
+	    ;;
 	'-pthread')
 	    DEPS="$DEPS -pthread"
 	    ;;
@@ -198,7 +202,7 @@ fi
 #
 case $ARCH in
 
-    'Linux' | 'OpenBSD' | 'GNU' | GNU/*)
+    'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*)
 	# we assume gcc
 
 	if [ "x$LINK" = "x" ] ; then
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 9f995667b4..46185cebbc 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -126,6 +126,6 @@ depend: $(SOURCES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
 	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
-		> /dev/null 
+		$(X11_INCLUDES) > /dev/null 
 
 include depend
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 727c5838be..8370e3bb6c 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -61,7 +61,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 depend: $(GLW_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
-		> /dev/null 
+		$(X11_INCLUDES) > /dev/null 
 
 
 include depend
diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c
index b635894fe5..9f6f3277da 100644
--- a/src/mesa/drivers/dri/common/xmlconfig.c
+++ b/src/mesa/drivers/dri/common/xmlconfig.c
@@ -63,6 +63,9 @@ extern char *program_invocation_name, *program_invocation_short_name;
 #elif defined(__NetBSD__) && defined(__NetBSD_Version) && (__NetBSD_Version >= 106000100)
 #    include <stdlib.h>
 #    define GET_PROGRAM_NAME() getprogname()
+#elif defined(__DragonFly__)
+#    include <stdlib.h>
+#    define GET_PROGRAM_NAME() getprogname()
 #endif
 
 #if !defined(GET_PROGRAM_NAME)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 2ecfbdc026..54fdcb779c 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -258,7 +258,7 @@ _mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
 void
 _mesa_bzero( void *dst, size_t n )
 {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
    bzero( dst, n );
 #else
    memset( dst, 0, n );
diff --git a/src/mesa/x86/common_x86.c b/src/mesa/x86/common_x86.c
index 0b2af0a370..bbdebe046f 100644
--- a/src/mesa/x86/common_x86.c
+++ b/src/mesa/x86/common_x86.c
@@ -38,7 +38,7 @@
 #if defined(USE_SSE_ASM) && defined(__linux__)
 #include <linux/version.h>
 #endif
-#if defined(USE_SSE_ASM) && defined(__FreeBSD__)
+#if defined(USE_SSE_ASM) && (defined(__FreeBSD__) || defined(__DragonFly__))
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #endif
@@ -104,7 +104,7 @@ static LONG WINAPI ExceptionFilter(LPEXCEPTION_POINTERS exp)
 
 static void check_os_sse_support( void )
 {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
    {
       int ret, enabled;
       unsigned int len;
-- 
cgit v1.2.3


From 02ddc08353123ae512d946635058354a67dc2d08 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Apr 2008 19:00:53 -0600
Subject: initial 7.0.4 relnotes

---
 docs/relnotes-7.0.4.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 docs/relnotes-7.0.4.html

diff --git a/docs/relnotes-7.0.4.html b/docs/relnotes-7.0.4.html
new file mode 100644
index 0000000000..1a7435261e
--- /dev/null
+++ b/docs/relnotes-7.0.4.html
@@ -0,0 +1,54 @@
+<HTML>
+
+<TITLE>Mesa Release Notes</TITLE>
+
+<head><link rel="stylesheet" type="text/css" href="mesa.css"></head>
+
+<BODY>
+
+<body bgcolor="#eeeeee">
+
+<H1>Mesa 7.0.4 Release Notes / (TBD 2008)</H1>
+
+<p>
+Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
+</p>
+
+
+<h2>MD5 checksums</h2>
+<pre>
+</pre>
+
+
+<h2>Bug fixes</h2>
+<ul>
+</ul>
+
+<h2>Changes</h2>
+<ul>
+<li>Added support for DragonFly OS
+</ul>
+
+
+
+<h2>Driver Status</h2>
+
+<pre>
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+</pre>
+
+</body>
+</html>
-- 
cgit v1.2.3


From ef76dfc7a0404e069d60796353f961680d13e69e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Apr 2008 19:01:07 -0600
Subject: add link to 7.0.4 relnotes

---
 docs/relnotes.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/relnotes.html b/docs/relnotes.html
index 8469c7f670..79e7118e2c 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -20,6 +20,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="relnotes-7.0.4.html">7.0.4 release notes</A>
 <LI><A HREF="relnotes-7.0.3.html">7.0.3 release notes</A>
 <LI><A HREF="relnotes-7.0.2.html">7.0.2 release notes</A>
 <LI><A HREF="relnotes-7.0.1.html">7.0.1 release notes</A>
-- 
cgit v1.2.3


From 40ee989db56cb3938e36c436c7c4b1def7aa2331 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Apr 2008 19:02:41 -0600
Subject: Hasso Tepper <hasso@estpak.ee>

---
 configs/dragonfly           | 38 ++++++++++++++++++++++++++++++
 configs/dragonfly-dri       | 56 +++++++++++++++++++++++++++++++++++++++++++++
 configs/dragonfly-dri-amd64 | 10 ++++++++
 configs/dragonfly-dri-x86   | 13 +++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 configs/dragonfly
 create mode 100644 configs/dragonfly-dri
 create mode 100644 configs/dragonfly-dri-amd64
 create mode 100644 configs/dragonfly-dri-x86

diff --git a/configs/dragonfly b/configs/dragonfly
new file mode 100644
index 0000000000..97c10e3c90
--- /dev/null
+++ b/configs/dragonfly
@@ -0,0 +1,38 @@
+# Configuration for DragonFly
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = DragonFly
+
+# Compiler and flags
+CC = cc
+CXX = c++
+MAKE = gmake
+
+OPT_FLAGS  = -O2
+PIC_FLAGS  = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
+	-DHZ=100
+
+X11_INCLUDES = -I/usr/pkg/include
+
+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) \
+	-ffast-math -pedantic
+
+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+EXTRA_LIB_PATH = -L/usr/pkg/lib
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) \
+	-l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
+# Installation directories (for make install)
+INSTALL_DIR = /usr/pkg
+DRI_DRIVER_INSTALL_DIR = /usr/pkg/lib/modules/dri/
+
diff --git a/configs/dragonfly-dri b/configs/dragonfly-dri
new file mode 100644
index 0000000000..cb96971804
--- /dev/null
+++ b/configs/dragonfly-dri
@@ -0,0 +1,56 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly
+
+CONFIG_NAME = dragonfly-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+
+EXPAT_INCLUDES = -I/usr/pkg/include
+X11_INCLUDES = -I/usr/pkg/include
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes \
+	-std=c99 -Wundef -ffast-math $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi \
+	-pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+ASM_SOURCES = 
+
+# Library/program dependencies
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+DRI_LIB_DEPS = -L/usr/pkg/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/pkg/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+	-lm -lpthread $(LIBDRM_LIB)
+
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGLU -lGL -lX11 -lXmu \
+	-lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGL -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM = dri
+
+DRM_SOURCE_PATH = $(TOP)/../drm
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+	   unichrome savage sis
+
diff --git a/configs/dragonfly-dri-amd64 b/configs/dragonfly-dri-amd64
new file mode 100644
index 0000000000..6c812da794
--- /dev/null
+++ b/configs/dragonfly-dri-amd64
@@ -0,0 +1,10 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri-amd64: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly-dri
+
+CONFIG_NAME = dragonfly-dri-x86-64
+
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
diff --git a/configs/dragonfly-dri-x86 b/configs/dragonfly-dri-x86
new file mode 100644
index 0000000000..1fefa80428
--- /dev/null
+++ b/configs/dragonfly-dri-x86
@@ -0,0 +1,13 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri-x86: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly-dri
+
+CONFIG_NAME = dragonfly-dri-x86
+
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
-- 
cgit v1.2.3


From f51b76b67080cbc94d932e272bded64b303dbff2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Apr 2008 19:04:36 -0600
Subject: Revert "Hasso Tepper <hasso@estpak.ee>"

This reverts commit 40ee989db56cb3938e36c436c7c4b1def7aa2331.
---
 configs/dragonfly           | 38 ------------------------------
 configs/dragonfly-dri       | 56 ---------------------------------------------
 configs/dragonfly-dri-amd64 | 10 --------
 configs/dragonfly-dri-x86   | 13 -----------
 4 files changed, 117 deletions(-)
 delete mode 100644 configs/dragonfly
 delete mode 100644 configs/dragonfly-dri
 delete mode 100644 configs/dragonfly-dri-amd64
 delete mode 100644 configs/dragonfly-dri-x86

diff --git a/configs/dragonfly b/configs/dragonfly
deleted file mode 100644
index 97c10e3c90..0000000000
--- a/configs/dragonfly
+++ /dev/null
@@ -1,38 +0,0 @@
-# Configuration for DragonFly
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = DragonFly
-
-# Compiler and flags
-CC = cc
-CXX = c++
-MAKE = gmake
-
-OPT_FLAGS  = -O2
-PIC_FLAGS  = -fPIC
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
-	-DHZ=100
-
-X11_INCLUDES = -I/usr/pkg/include
-
-CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) \
-	-ffast-math -pedantic
-
-CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
-
-GLUT_CFLAGS = -fexceptions
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-EXTRA_LIB_PATH = -L/usr/pkg/lib
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) \
-	-l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
-
-# Installation directories (for make install)
-INSTALL_DIR = /usr/pkg
-DRI_DRIVER_INSTALL_DIR = /usr/pkg/lib/modules/dri/
-
diff --git a/configs/dragonfly-dri b/configs/dragonfly-dri
deleted file mode 100644
index cb96971804..0000000000
--- a/configs/dragonfly-dri
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly
-
-CONFIG_NAME = dragonfly-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-
-EXPAT_INCLUDES = -I/usr/pkg/include
-X11_INCLUDES = -I/usr/pkg/include
-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
-	-DHAVE_ALIAS
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes \
-	-std=c99 -Wundef -ffast-math $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi \
-	-pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-ASM_SOURCES = 
-
-# Library/program dependencies
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
-DRI_LIB_DEPS = -L/usr/pkg/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/pkg/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
-	-lm -lpthread $(LIBDRM_LIB)
-
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGLU -lGL -lX11 -lXmu \
-	-lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGL -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM = dri
-
-DRM_SOURCE_PATH = $(TOP)/../drm
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
-	   unichrome savage sis
-
diff --git a/configs/dragonfly-dri-amd64 b/configs/dragonfly-dri-amd64
deleted file mode 100644
index 6c812da794..0000000000
--- a/configs/dragonfly-dri-amd64
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri-amd64: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly-dri
-
-CONFIG_NAME = dragonfly-dri-x86-64
-
-ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
diff --git a/configs/dragonfly-dri-x86 b/configs/dragonfly-dri-x86
deleted file mode 100644
index 1fefa80428..0000000000
--- a/configs/dragonfly-dri-x86
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*-makefile-*-
-# Configuration for dragonfly-dri-x86: DragonFly DRI hardware drivers
-
-include $(TOP)/configs/dragonfly-dri
-
-CONFIG_NAME = dragonfly-dri-x86
-
-# Unnecessary on x86, generally.
-PIC_FLAGS = 
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
-- 
cgit v1.2.3


From 39dca05d1d5c66fd481c8e94d1edc5741f45a2fa Mon Sep 17 00:00:00 2001
From: Hasso Tepper <hasso@estpak.ee>
Date: Wed, 9 Apr 2008 19:05:59 -0600
Subject: New dragonfly configs

A re-do commit, this time with the intended commit message.
---
 configs/dragonfly           | 38 ++++++++++++++++++++++++++++++
 configs/dragonfly-dri       | 56 +++++++++++++++++++++++++++++++++++++++++++++
 configs/dragonfly-dri-amd64 | 10 ++++++++
 configs/dragonfly-dri-x86   | 13 +++++++++++
 4 files changed, 117 insertions(+)
 create mode 100644 configs/dragonfly
 create mode 100644 configs/dragonfly-dri
 create mode 100644 configs/dragonfly-dri-amd64
 create mode 100644 configs/dragonfly-dri-x86

diff --git a/configs/dragonfly b/configs/dragonfly
new file mode 100644
index 0000000000..97c10e3c90
--- /dev/null
+++ b/configs/dragonfly
@@ -0,0 +1,38 @@
+# Configuration for DragonFly
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = DragonFly
+
+# Compiler and flags
+CC = cc
+CXX = c++
+MAKE = gmake
+
+OPT_FLAGS  = -O2
+PIC_FLAGS  = -fPIC
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
+	-DHZ=100
+
+X11_INCLUDES = -I/usr/pkg/include
+
+CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) \
+	-ffast-math -pedantic
+
+CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+EXTRA_LIB_PATH = -L/usr/pkg/lib
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) \
+	-l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
+
+# Installation directories (for make install)
+INSTALL_DIR = /usr/pkg
+DRI_DRIVER_INSTALL_DIR = /usr/pkg/lib/modules/dri/
+
diff --git a/configs/dragonfly-dri b/configs/dragonfly-dri
new file mode 100644
index 0000000000..cb96971804
--- /dev/null
+++ b/configs/dragonfly-dri
@@ -0,0 +1,56 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly
+
+CONFIG_NAME = dragonfly-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+
+EXPAT_INCLUDES = -I/usr/pkg/include
+X11_INCLUDES = -I/usr/pkg/include
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes \
+	-std=c99 -Wundef -ffast-math $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi \
+	-pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+ASM_SOURCES = 
+
+# Library/program dependencies
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+DRI_LIB_DEPS = -L/usr/pkg/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/pkg/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+	-lm -lpthread $(LIBDRM_LIB)
+
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGLU -lGL -lX11 -lXmu \
+	-lXt -lXi -lm
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/pkg/lib -lGL -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx/x11 mesa glu glut/glx glw
+DRIVER_DIRS = dri
+PROGRAM_DIRS = 
+WINDOW_SYSTEM = dri
+
+DRM_SOURCE_PATH = $(TOP)/../drm
+
+# ffb and gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+	   unichrome savage sis
+
diff --git a/configs/dragonfly-dri-amd64 b/configs/dragonfly-dri-amd64
new file mode 100644
index 0000000000..6c812da794
--- /dev/null
+++ b/configs/dragonfly-dri-amd64
@@ -0,0 +1,10 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri-amd64: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly-dri
+
+CONFIG_NAME = dragonfly-dri-x86-64
+
+ASM_FLAGS = -DUSE_X86_64_ASM
+ASM_SOURCES = $(X86-64_SOURCES)
+ASM_API = $(X86-64_API)
diff --git a/configs/dragonfly-dri-x86 b/configs/dragonfly-dri-x86
new file mode 100644
index 0000000000..1fefa80428
--- /dev/null
+++ b/configs/dragonfly-dri-x86
@@ -0,0 +1,13 @@
+# -*-makefile-*-
+# Configuration for dragonfly-dri-x86: DragonFly DRI hardware drivers
+
+include $(TOP)/configs/dragonfly-dri
+
+CONFIG_NAME = dragonfly-dri-x86
+
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
+
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+ASM_SOURCES = $(X86_SOURCES)
+ASM_API = $(X86_API)
-- 
cgit v1.2.3


From 18404076e32f2ee63d4aba1382611c5608e1ab12 Mon Sep 17 00:00:00 2001
From: Roland Scheidegger <sroland@tungstengraphics.com>
Date: Sat, 12 Apr 2008 02:40:44 +0200
Subject: r200: fix XPD vertex program instruction when using temps as inputs

due to the two read ports limit into temp memory may need the MAD_2 instruction
for the second instruction of the decomposed XPD.
While here, also try to avoid MAD_2 for MAD if all 3 inputs are temps but the
temps aren't actually distinct.
---
 src/mesa/drivers/dri/r200/r200_vertprog.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c
index 6089d617c6..70881fd757 100644
--- a/src/mesa/drivers/dri/r200/r200_vertprog.c
+++ b/src/mesa/drivers/dri/r200/r200_vertprog.c
@@ -744,9 +744,16 @@ static GLboolean r200_translate_vertex_program(GLcontext *ctx, struct r200_verte
 	 goto next;
 
       case OPCODE_MAD:
+	 /* only 2 read ports into temp memory thus may need the macro op MAD_2
+	    instead (requiring 2 clocks) if all inputs are in temp memory
+	    (and, only if they actually reference 3 distinct temps) */
 	 hw_op=(src[0].File == PROGRAM_TEMPORARY &&
 	    src[1].File == PROGRAM_TEMPORARY &&
-	    src[2].File == PROGRAM_TEMPORARY) ? R200_VPI_OUT_OP_MAD_2 : R200_VPI_OUT_OP_MAD;
+	    src[2].File == PROGRAM_TEMPORARY &&
+	    (((src[0].RelAddr << 8) | src[0].Index) != ((src[1].RelAddr << 8) | src[1].Index)) &&
+	    (((src[0].RelAddr << 8) | src[0].Index) != ((src[2].RelAddr << 8) | src[2].Index)) &&
+	    (((src[1].RelAddr << 8) | src[1].Index) != ((src[2].RelAddr << 8) | src[2].Index))) ?
+	    R200_VPI_OUT_OP_MAD_2 : R200_VPI_OUT_OP_MAD;
 
 	 o_inst->op = MAKE_VSF_OP(hw_op, t_dst(&dst),
 	    t_dst_mask(dst.WriteMask));
@@ -874,8 +881,11 @@ else {
       case OPCODE_XPD:
 	 /* mul r0, r1.yzxw, r2.zxyw
 	    mad r0, -r2.yzxw, r1.zxyw, r0
-	    NOTE: might need MAD_2
 	  */
+	 hw_op=(src[0].File == PROGRAM_TEMPORARY &&
+	    src[1].File == PROGRAM_TEMPORARY &&
+	    (((src[0].RelAddr << 8) | src[0].Index) != ((src[1].RelAddr << 8) | src[1].Index))) ?
+	    R200_VPI_OUT_OP_MAD_2 : R200_VPI_OUT_OP_MAD;
 
 	 o_inst->op = MAKE_VSF_OP(R200_VPI_OUT_OP_MUL,
 	    (u_temp_i << R200_VPI_OUT_REG_INDEX_SHIFT) | R200_VSF_OUT_CLASS_TMP,
@@ -901,7 +911,7 @@ else {
 	 o_inst++;
 	 u_temp_i--;
 
-	 o_inst->op = MAKE_VSF_OP(R200_VPI_OUT_OP_MAD, t_dst(&dst),
+	 o_inst->op = MAKE_VSF_OP(hw_op, t_dst(&dst),
 		t_dst_mask(dst.WriteMask));
 
 	 o_inst->src0 = MAKE_VSF_SOURCE(t_src_index(vp, &src[1]),
-- 
cgit v1.2.3


From ff3033e19018009813e4e3e71df9e16b460758fc Mon Sep 17 00:00:00 2001
From: David Flynn <davidf+nntp@woaf.net>
Date: Mon, 14 Apr 2008 12:55:25 -0600
Subject: define #extension GL_ARB_texture_rectangle

---
 src/mesa/shader/slang/slang_preprocess.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index 72281eda57..51afdb94a7 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -483,6 +483,7 @@ pp_cond_stack_reevaluate (pp_cond_stack *self)
 typedef struct
 {
    GLboolean MESA_shader_debug;        /* GL_MESA_shader_debug enable */
+   GLboolean GL_ARB_texture_rectangle; /* GL_ARB_texture_rectangle enable */
 } pp_ext;
 
 /*
@@ -498,6 +499,7 @@ static GLvoid
 pp_ext_init (pp_ext *self)
 {
    pp_ext_disable_all (self);
+   self->GL_ARB_texture_rectangle = GL_TRUE;
    /* Other initialization code goes here. */
 }
 
@@ -506,6 +508,8 @@ pp_ext_set (pp_ext *self, const char *name, GLboolean enable)
 {
    if (_mesa_strcmp (name, "MESA_shader_debug") == 0)
       self->MESA_shader_debug = enable;
+   else if (_mesa_strcmp (name, "GL_ARB_texture_rectangle") == 0)
+      self->GL_ARB_texture_rectangle = enable;
    /* Next extension name tests go here. */
    else
       return GL_FALSE;
-- 
cgit v1.2.3


From 4fd7f6047c0452a93a9eadcd40d687e6c192b716 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Apr 2008 12:58:10 -0600
Subject: define #extension GL_ARB_texture_rectangle

---
 docs/relnotes-7.0.4.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/relnotes-7.0.4.html b/docs/relnotes-7.0.4.html
index 1a7435261e..7ae2e4391f 100644
--- a/docs/relnotes-7.0.4.html
+++ b/docs/relnotes-7.0.4.html
@@ -22,6 +22,7 @@ Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
 
 <h2>Bug fixes</h2>
 <ul>
+<li>define #extension GL_ARB_texture_rectangle in shading language
 </ul>
 
 <h2>Changes</h2>
-- 
cgit v1.2.3


From 8de268bb3c4701709c431a56da72711ba745a224 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Apr 2008 12:58:36 -0600
Subject: add -Wl case (part of prev DragonFly patch)

---
 bin/mklib | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/mklib b/bin/mklib
index 6d353b2455..93eeb44150 100755
--- a/bin/mklib
+++ b/bin/mklib
@@ -115,6 +115,9 @@ do
 	    # Another special case for DragonFly
 	    DEPS="$DEPS $1"
 	    ;;
+	-Wl*)
+	    DEPS="$DEPS $1"
+	    ;;
 	'-pthread')
 	    DEPS="$DEPS -pthread"
 	    ;;
-- 
cgit v1.2.3


From 91d59e4cb94454ac59ae9e83069379d2131d8a0e Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Apr 2008 13:40:39 -0600
Subject: check for _WIN32 and __WIN32__

---
 src/glu/sgi/libutil/mipmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/glu/sgi/libutil/mipmap.c b/src/glu/sgi/libutil/mipmap.c
index 44f519a4e2..d65b7f689f 100644
--- a/src/glu/sgi/libutil/mipmap.c
+++ b/src/glu/sgi/libutil/mipmap.c
@@ -6627,7 +6627,7 @@ typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level,
 
 static TexImage3Dproc pTexImage3D = 0;
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__WIN32__)
 #  include <dlfcn.h>
 #  include <sys/types.h>
 #else
@@ -6642,7 +6642,7 @@ static void gluTexImage3D( GLenum target, GLint level,
 			   const GLvoid *pixels )
 {
    if (!pTexImage3D) {
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__WIN32__)
       pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3D");
       if (!pTexImage3D)
 	 pTexImage3D = (TexImage3Dproc) wglGetProcAddress("glTexImage3DEXT");
-- 
cgit v1.2.3


From 62c67576e0f6a101e6d7e8757825484004ca265c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Apr 2008 13:41:17 -0600
Subject: fixed WIN32 compile problem in libGLU

---
 docs/relnotes-7.0.4.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/relnotes-7.0.4.html b/docs/relnotes-7.0.4.html
index 7ae2e4391f..741f56e634 100644
--- a/docs/relnotes-7.0.4.html
+++ b/docs/relnotes-7.0.4.html
@@ -23,6 +23,7 @@ Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
 <h2>Bug fixes</h2>
 <ul>
 <li>define #extension GL_ARB_texture_rectangle in shading language
+<li>fixed WIN32 compile problem in libGLU
 </ul>
 
 <h2>Changes</h2>
-- 
cgit v1.2.3


From 6c9e1b233745a376a07cedf802f70c8a4276fcd7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 14 Apr 2008 13:44:05 -0600
Subject: fix GL_ARB_texture_rectangle breakage

---
 src/mesa/shader/slang/slang_preprocess.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/shader/slang/slang_preprocess.c b/src/mesa/shader/slang/slang_preprocess.c
index 51afdb94a7..a986db153e 100644
--- a/src/mesa/shader/slang/slang_preprocess.c
+++ b/src/mesa/shader/slang/slang_preprocess.c
@@ -483,7 +483,7 @@ pp_cond_stack_reevaluate (pp_cond_stack *self)
 typedef struct
 {
    GLboolean MESA_shader_debug;        /* GL_MESA_shader_debug enable */
-   GLboolean GL_ARB_texture_rectangle; /* GL_ARB_texture_rectangle enable */
+   GLboolean ARB_texture_rectangle; /* GL_ARB_texture_rectangle enable */
 } pp_ext;
 
 /*
@@ -499,7 +499,7 @@ static GLvoid
 pp_ext_init (pp_ext *self)
 {
    pp_ext_disable_all (self);
-   self->GL_ARB_texture_rectangle = GL_TRUE;
+   self->ARB_texture_rectangle = GL_TRUE;
    /* Other initialization code goes here. */
 }
 
@@ -509,7 +509,7 @@ pp_ext_set (pp_ext *self, const char *name, GLboolean enable)
    if (_mesa_strcmp (name, "MESA_shader_debug") == 0)
       self->MESA_shader_debug = enable;
    else if (_mesa_strcmp (name, "GL_ARB_texture_rectangle") == 0)
-      self->GL_ARB_texture_rectangle = enable;
+      self->ARB_texture_rectangle = enable;
    /* Next extension name tests go here. */
    else
       return GL_FALSE;
-- 
cgit v1.2.3


From 534f30064daf380db3b624c7fc1d4c8f635556b8 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 22 Apr 2008 20:28:35 +0100
Subject: Fix error string

---
 src/mesa/shader/prog_execute.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index f4a12af3e4..4a89d8951e 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1519,8 +1519,9 @@ _mesa_execute_program(GLcontext * ctx,
       case OPCODE_END:
          return GL_TRUE;
       default:
-         _mesa_problem(ctx, "Bad opcode %d in _mesa_exec_fragment_program",
+         _mesa_problem(ctx, "Bad opcode %d in _mesa_execute_program",
                        inst->Opcode);
+		       assert(0);
          return GL_TRUE;        /* return value doesn't matter */
 
       }
-- 
cgit v1.2.3


From 06b0a7acce6aa4415adaf7456f17e46230bbd7bc Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 22 Apr 2008 20:29:00 +0100
Subject: correct the return value

---
 src/mesa/shader/prog_statevars.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 05daa8011d..71355c393c 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -813,7 +813,7 @@ _mesa_load_state_parameters(GLcontext *ctx,
    GLuint i;
 
    if (!paramList)
-      return;
+      return retval;
 
    for (i = 0; i < paramList->NumParameters; i++) {
       if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
-- 
cgit v1.2.3


From 5545b46571c903d293f8a52ec0a36c1b19e6a693 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 22 Apr 2008 20:29:42 +0100
Subject: small cleanups

---
 src/mesa/shader/prog_parameter.c |  3 +--
 src/mesa/shader/program.c        |  1 -
 src/mesa/shader/shader_api.c     | 12 ++++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 46d30872e4..3ad7215755 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -40,8 +40,7 @@
 struct gl_program_parameter_list *
 _mesa_new_parameter_list(void)
 {
-   return (struct gl_program_parameter_list *)
-      _mesa_calloc(sizeof(struct gl_program_parameter_list));
+   return CALLOC_STRUCT(gl_program_parameter_list);
 }
 
 
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 95cabe7323..a8983703fa 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -187,7 +187,6 @@ _mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
 {
    (void) ctx;
    if (prog) {
-      _mesa_bzero(prog, sizeof(*prog));
       prog->Id = id;
       prog->Target = target;
       prog->Resident = GL_TRUE;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 5f9e2b84a4..218c7cd309 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -128,10 +128,17 @@ _mesa_free_shader_program_data(GLcontext *ctx,
    for (i = 0; i < shProg->NumShaders; i++) {
       _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL);
    }
+   shProg->NumShaders = 0;
+
    if (shProg->Shaders) {
       _mesa_free(shProg->Shaders);
       shProg->Shaders = NULL;
    }
+
+   if (shProg->InfoLog) {
+      _mesa_free(shProg->InfoLog);
+      shProg->InfoLog = NULL;
+   }
 }
 
 
@@ -142,10 +149,7 @@ void
 _mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
 {
    _mesa_free_shader_program_data(ctx, shProg);
-   if (shProg->Shaders) {
-      _mesa_free(shProg->Shaders);
-      shProg->Shaders = NULL;
-   }
+
    _mesa_free(shProg);
 }
 
-- 
cgit v1.2.3


From f6d6fc603ec328d08e2c72e33d97af477a741f0b Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 22 Apr 2008 23:08:35 +0100
Subject: revert

---
 src/mesa/shader/prog_statevars.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 71355c393c..05daa8011d 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -813,7 +813,7 @@ _mesa_load_state_parameters(GLcontext *ctx,
    GLuint i;
 
    if (!paramList)
-      return retval;
+      return;
 
    for (i = 0; i < paramList->NumParameters; i++) {
       if (paramList->Parameters[i].Type == PROGRAM_STATE_VAR) {
-- 
cgit v1.2.3


From 36bad2b47800c96a3324f5cec167e6a9d712bee3 Mon Sep 17 00:00:00 2001
From: Anatolij Shkodin <nausun@gmail.com>
Date: Wed, 23 Apr 2008 08:21:59 -0600
Subject: added freebsd-static

---
 Makefile               |  1 +
 configs/freebsd-static | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 configs/freebsd-static

diff --git a/Makefile b/Makefile
index 628f64c212..a010e42ed6 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,7 @@ freebsd \
 freebsd-dri \
 freebsd-dri-amd64 \
 freebsd-dri-x86 \
+freebsd-static \
 hpux10 \
 hpux10-gcc \
 hpux10-static \
diff --git a/configs/freebsd-static b/configs/freebsd-static
new file mode 100644
index 0000000000..f87b1b8e42
--- /dev/null
+++ b/configs/freebsd-static
@@ -0,0 +1,27 @@
+# Configuration for generic FreeBSD, making static libs
+# Written by cy on 2008-04-23.
+
+include $(TOP)/configs/freebsd
+
+CONFIG_NAME = freebsd-static
+
+MKLIB_OPTIONS = -static
+PIC_FLAGS =
+
+# Library names (actual file names)
+GL_LIB_NAME = libGL.a
+GLU_LIB_NAME = libGLU.a
+GLUT_LIB_NAME = libglut.a
+GLW_LIB_NAME = libGLw.a
+OSMESA_LIB_NAME = libOSMesa.a
+
+# Library/program dependencies (static libs don't have dependencies)
+GL_LIB_DEPS = 
+OSMESA_LIB_DEPS = 
+GLU_LIB_DEPS = 
+GLUT_LIB_DEPS = 
+GLW_LIB_DEPS = 
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread \
+	-lstdc++ -lm
-- 
cgit v1.2.3


From 138e0010eb890b8edbd5a77a30cb76a421129648 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 23 Apr 2008 08:22:47 -0600
Subject: added FreeBSD static config

---
 docs/relnotes-7.0.4.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/relnotes-7.0.4.html b/docs/relnotes-7.0.4.html
index 741f56e634..bcd30cc5a5 100644
--- a/docs/relnotes-7.0.4.html
+++ b/docs/relnotes-7.0.4.html
@@ -29,10 +29,12 @@ Mesa 7.0.4 is a stable release with bug fixes since version 7.0.3.
 <h2>Changes</h2>
 <ul>
 <li>Added support for DragonFly OS
+<li>Added a build config for FreeBSD static libs (Anatolij Shkodin)
 </ul>
 
 
 
+
 <h2>Driver Status</h2>
 
 <pre>
-- 
cgit v1.2.3


From 7b676192e92eb532c8e4347fa3bdba8bfff4064c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 24 Apr 2008 16:31:28 -0600
Subject: enable GL_EXT_multi_draw_arrays (see bug 15670)

---
 src/mesa/drivers/dri/r200/r200_context.c | 2 ++
 src/mesa/drivers/dri/r300/r300_context.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 786a298cc3..8eaa6fe940 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -70,6 +70,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define need_GL_ATI_fragment_shader
 #define need_GL_EXT_blend_minmax
 #define need_GL_EXT_fog_coord
+#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_secondary_color
 #define need_GL_EXT_blend_equation_separate
 #define need_GL_EXT_blend_func_separate
@@ -133,6 +134,7 @@ const struct dri_extension card_extensions[] =
     { "GL_EXT_blend_minmax",               GL_EXT_blend_minmax_functions },
     { "GL_EXT_blend_subtract",             NULL },
     { "GL_EXT_fog_coord",                  GL_EXT_fog_coord_functions },
+    { "GL_EXT_multi_draw_arrays",          GL_EXT_multi_draw_arrays_functions },
     { "GL_EXT_secondary_color",            GL_EXT_secondary_color_functions },
     { "GL_EXT_stencil_wrap",               NULL },
     { "GL_EXT_texture_edge_clamp",         NULL },
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 9ea14ab4c7..4ad947b088 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -83,6 +83,7 @@ int hw_tcl_on = 1;
 #define need_GL_ARB_vertex_program
 #define need_GL_EXT_blend_minmax
 //#define need_GL_EXT_fog_coord
+#define need_GL_EXT_multi_draw_arrays
 #define need_GL_EXT_secondary_color
 #define need_GL_EXT_blend_equation_separate
 #define need_GL_EXT_blend_func_separate
@@ -110,6 +111,7 @@ const struct dri_extension card_extensions[] = {
   {"GL_EXT_blend_minmax",		GL_EXT_blend_minmax_functions},
   {"GL_EXT_blend_subtract",		NULL},
 //  {"GL_EXT_fog_coord",			GL_EXT_fog_coord_functions },
+  {"GL_EXT_multi_draw_arrays",		GL_EXT_multi_draw_arrays_functions},
   {"GL_EXT_gpu_program_parameters",     GL_EXT_gpu_program_parameters_functions},
   {"GL_EXT_secondary_color", 		GL_EXT_secondary_color_functions},
   {"GL_EXT_stencil_two_side",		GL_EXT_stencil_two_side_functions},
-- 
cgit v1.2.3