[cairo-commit] cairo/src cairo-glitz-surface.c,1.60,1.61

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv10613/src

Modified Files:
	cairo-glitz-surface.c 
Log Message:
Change Carl's comment about saturate operator

Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- cairo-glitz-surface.c	14 Sep 2005 16:12:13 -0000	1.60
+++ cairo-glitz-surface.c	14 Sep 2005 16:25:07 -0000	1.61
@@ -436,12 +436,13 @@
     case CAIRO_OPERATOR_ADD:
 	return GLITZ_OPERATOR_ADD;
     case CAIRO_OPERATOR_SATURATE:
-	/* XXX: OVER is definitely not the right thing here, (but it
-	 * is what the original glitz backend code has always
-	 * done). Cairo's SATURATE operator is the native GL
-	 * compositing mode, (from my understanding). So why isn't
-	 * there a GLITZ_OPERATOR_SATURATE for us to use here? */
-	return GLITZ_OPERATOR_OVER;
+	/* XXX: This line should never be reached. Glitz backend should bail
+	   out earlier if saturate operator is used. OpenGL can't do saturate
+	   with pre-multiplied colors. Solid colors can still be done as we
+	   can just un-pre-multiply them. However, support for that will have
+	   to be added to glitz. */
+
+	/* fall-through */
     }
 
     ASSERT_NOT_REACHED;