beryl-(core|plugins): moved matrix transformations out of gl (David Reveman)

- group not ported yet
- blurfx has bugs but this will be fixed in a rewrite
all other plugins should work


git-svn-id: file:///beryl/trunk@4005 d7aaf104-2d23-0410-ae22-9d23157bf5a3

1 files changed, 6 insertions, 5 deletions

diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c
index ad111e7..0b78909 100644
--- a/beryl-plugins/src/rotate.c
+++ b/beryl-plugins/src/rotate.c
@@ -966,6 +966,7 @@ static void rotateDonePaintScreen(CompScreen * s)
 static Bool
 rotatePaintScreen(CompScreen * s,
 				  const ScreenPaintAttrib * sAttrib,
+				  const CompTransform     *transform,
 				  Region region, int output, unsigned int mask)
 {
 	Bool status;
@@ -986,7 +987,7 @@ rotatePaintScreen(CompScreen * s,
 		mask |= PAINT_SCREEN_TRANSFORMED_MASK;
 
 		UNWRAP(rs, s, paintScreen);
-		status = (*s->paintScreen) (s, &sa, region, output, mask);
+		status = (*s->paintScreen) (s, &sa, transform, region, output, mask);
 		WRAP(rs, s, paintScreen, rotatePaintScreen);
 	}
 	else if (rs->zooming && rs->zoomTranslate != 0.0f)
@@ -998,13 +999,13 @@ rotatePaintScreen(CompScreen * s,
 		mask |= PAINT_SCREEN_TRANSFORMED_MASK;
 
 		UNWRAP(rs, s, paintScreen);
-		status = (*s->paintScreen) (s, &sa, region, output, mask);
+		status = (*s->paintScreen) (s, &sa, transform, region, output, mask);
 		WRAP(rs, s, paintScreen, rotatePaintScreen);
 	}
 	else
 	{
 		UNWRAP(rs, s, paintScreen);
-		status = (*s->paintScreen) (s, sAttrib, region, output, mask);
+		status = (*s->paintScreen) (s, sAttrib, transform, region, output, mask);
 		WRAP(rs, s, paintScreen, rotatePaintScreen);
 	}
 
@@ -1199,7 +1200,7 @@ rotate(CompDisplay * d,
 
 		/* FIXME: this is sort of a hack - we check if
 		   the state of scale is "waiting for user
-		   we definitely need a better communication 
+		   we definitely need a better communication
 		   mechanism here... */
 
 		int *scaleState = (int *)IPCS_GetVPtrND(IPCS_OBJECT(s),
@@ -2052,7 +2053,7 @@ static void handleMotionNotify(CompDisplay * d, XEvent * event)
 		rs->savedPointer.y += d->pointerY - d->lastPointerY;
 		return;
 	}
-	
+
 
 	for (s = d->screens; s; s = s->next)
 	{