Merge lp:~smspillaz/compiz/gles2.fix_1001171 into lp:~compiz-linaro-team/compiz/gles2

[Sam Spilsbury]

Fixes LP#1101171 ... at least for me.

1) Scale up the view matrix by 2 on each axis so that it matches the projection matrix when setting clip planes
2) Set the transformed bit on windows sliding on wall.

I am almost certain that #1 is the wrong approach here ... although I couldn't find anything else in the code that wasn't a value that it was supposed to be. Perhaps the projection matrix is setup differently?

#2 also shouldn't be necessary ... but is harmless and makes sense (moving windows ... different clip regions etc)

[Daniel van Vugt (vanvugt)]

I think it's in the right ballpark but:
1. Seems to cause weird decoration clipping bugs when sliding; and
2. I think using glScale is not ideal. (I will) try working it into the existing clipping calculation, or even figuring out what's wrong with the existing calculation in the context of the GLES branch.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> I think it's in the right ballpark but:
> 1. Seems to cause weird decoration clipping bugs when sliding; and

To be honest, I think we should disable clipping for all non shadow type decorations

> 2. I think using glScale is not ideal. (I will) try working it into the
> existing clipping calculation, or even figuring out what's wrong with the
> existing calculation in the context of the GLES branch.

[Daniel van Vugt (vanvugt)]

Bug 1001171 is now fixed (slightly differently). Please propose the related wall (and decor?) fixes separately without reference to this bug.

review: Needs Resubmitting

Unmerged revisions

3229. By Sam Spilsbury on 2012-05-26

Scale the plane clipping up to the projection matrix space and always
set the transformed bit on moving windows in wall

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-05-26 11:02:12 +0000
+++ plugins/opengl/src/paint.cpp	2012-05-26 15:11:22 +0000
@@ -431,6 +431,7 @@
 
     glPushMatrix ();
     glLoadMatrixf (transform.getMatrix ());
+    glScalef (2.0f, 2.0f, 1.0f);
 
     glClipPlane (GL_CLIP_PLANE0, top);
     glClipPlane (GL_CLIP_PLANE1, bottom);

=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2012-05-26 12:52:04 +0000
+++ plugins/wall/src/wall.cpp	2012-05-26 15:11:22 +0000
@@ -1480,13 +1480,15 @@
 
 	status = glWindow->glPaint (pA, matrix, region, mask);
     }
-    else if (ws->transform == Sliding && !isSliding)
+
+    if (ws->transform == Sliding)
+	mask |= PAINT_WINDOW_TRANSFORMED_MASK;
+
+    if (ws->transform == Sliding && !isSliding)
     {
 	GLMatrix wMatrix;
 
 	wMatrix.toScreenSpace (ws->currOutput, -DEFAULT_Z_CAMERA);
-	mask |= PAINT_WINDOW_TRANSFORMED_MASK;
-
 	status = glWindow->glPaint (attrib, wMatrix, region, mask);
     }
     else