xserver: Branch 'xgl-0-0-1' - 2 commits

[David Reveman]

 GL/mesa/main/Makefile.am |    1 +
 GL/symlink-mesa.sh       |    2 ++
 fb/fbpict.c              |    2 ++
 3 files changed, 5 insertions(+)

New commits:
diff-tree 5926f23ca7f0c5ec37955da044f3358347f2f534 (from 1c38237d7d770bdb2ae0e4059c908e9ac237e7c9)
Author: David Reveman <davidr at novell.com>
Date:   Sun Jun 18 19:38:05 2006 -0400

    Build without USE_MMX defined

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 638ffb9..c1fca9f 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1300,7 +1300,9 @@ fbComposite (CARD8      op,
 			    if (fbHaveMMX())
 				func = fbCompositeSrc_8888x8888mmx;
 #endif
+			    break;
 			}
+			break;
 		    }
 		}
 	    }
diff-tree 1c38237d7d770bdb2ae0e4059c908e9ac237e7c9 (from 450e02cce24cec47b7f08b87952d9f3430f2468b)
Author: David Reveman <davidr at novell.com>
Date:   Sun Jun 18 19:32:58 2006 -0400

    sync to mesa head

diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index 7e1bbd1..0eebcca 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -24,6 +24,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     api_loopback.c \
                     api_noop.c \
                     api_validate.c \
+                    arrayobj.c \
                     attrib.c \
                     blend.c \
                     bufferobj.c \
diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 326e4f0..32f839a 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -88,6 +88,8 @@ symlink_mesa_main() {
     action api_noop.h
     action api_validate.c
     action api_validate.h
+    action arrayobj.c
+    action arrayobj.h
     action attrib.c
     action attrib.h
     action bitset.h