xserver: Branch 'master'

[Søren Sandmann Pedersen]

 fb/fbpict.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

New commits:
diff-tree 262b9b104a04e55969593ef96a16004e53ecd00a (from 876b806ec09d5ff0c6cd19df91006c4eefedfaa6)
Author: Soren Sandmann Pedersen <ssp at dhcp83-218.boston.redhat.com>
Date:   Tue Feb 6 17:30:22 2007 -0500

    Use the new 8888x0565mmx function in fbpict.c

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 3ff609f..cd6cac2 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1175,7 +1175,12 @@ fbComposite (CARD8      op,
 			func = fbCompositeSrc_8888x0888;
 			break;
 		    case PICT_r5g6b5:
-			func = fbCompositeSrc_8888x0565;
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeSrc_8888x0565mmx;
+			else
+#endif
+			    func = fbCompositeSrc_8888x0565;
 			break;
 		    default:
 			break;
@@ -1221,7 +1226,12 @@ fbComposite (CARD8      op,
 			func = fbCompositeSrc_8888x0888;
 			break;
 		    case PICT_b5g6r5:
-			func = fbCompositeSrc_8888x0565;
+#ifdef USE_MMX
+			if (fbHaveMMX())
+			    func = fbCompositeSrc_8888x0565mmx;
+			else
+#endif
+			    func = fbCompositeSrc_8888x0565;
 			break;
 		    default:
 			break;