xserver: Branch 'master'

[Eric Anholt]

 fb/fbpict.h |    3 ---
 1 files changed, 3 deletions(-)

New commits:
diff-tree 2dc866252c84ed0e7b3afa25e8a5312f448d405b (from 0d6d373af95d0004d33b987d14ad7e04dd5d2003)
Author: Eric Anholt <eric at anholt.net>
Date:   Mon Jan 22 08:41:50 2007 +0800

    Really fix optimized render cases being hit when they shouldn't.
    
    I don't know how this define slipped in there.  Fixes
    6fdfd9dad91d7b7aa292f8c4d268dd27c34de8d3.

diff --git a/fb/fbpict.h b/fb/fbpict.h
index 5cdde9e..434526e 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -105,9 +105,6 @@ fbCanGetSolid(PicturePtr pict)
     }
 }
 
-#define fbCanGetSolid(pict) \
-(pict->pDrawable != NULL && pict->pDrawable->width == 1 && pict->pDrawable->height == 1)
-
 #define fbComposeGetSolid(pict, bits, fmt) { \
     FbBits	*__bits__; \
     FbStride	__stride__; \