Remove redundant composite op reduction, done in Render now.

2 files changed, 5 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index cdd798fd6..b29e744a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-23  Adam Jackson  <ajax@freedesktop.org>
+
+	* exa/exa_render.c:
+	Remove redundant composite op reduction, done in Render now.
+
 2006-02-22  Alexander Gottwald  <ago@starnet.com>
 
 	* GL/glx/render2swap.c:
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 206e19fa6..cb76b15aa 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -458,24 +458,6 @@ exaComposite(CARD8	op,
         return;
     }
 
-    /* simplify the drivers by reducing here */
-    switch (op) {
-	case PictOpDisjointClear:
-	case PictOpConjointClear:
-	    op = PictOpClear;
-	    break;    
-	case PictOpDisjointSrc:
-	case PictOpConjointSrc:
-	    op = PictOpSrc;
-	    break;    
-	case PictOpDisjointDst:
-	case PictOpConjointDst:
-	case PictOpDst:
-	    return;    
-	default:
-	    break;
-    }
-
     /* Remove repeat in source if useless */
     if (pSrc->repeat && !pSrc->transform && xSrc >= 0 &&
 	(xSrc + width) <= pSrc->pDrawable->width && ySrc >= 0 &&