Merge lp:~hikiko/compiz/compiz.shared-transform-ezoom into lp:compiz/0.9.12

[Eleni Maria Stea]

saves the enhanced zoom transformation on gScreen so that other plugins that use the opengl can use it

saves the enhanced zoom transformation on gScreen so that other plugins that use the opengl can use it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3950
http://jenkins.qa.ubuntu.com/job/compiz-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/62/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

vertexbuffer and 3d changes are probably for another MP

[Eleni Maria Stea (hikiko)]

> vertexbuffer and 3d changes are probably for another MP

Right. Basically that's part of the 3d windows plugin fix, which I forgot to add as a prerequisite branch :) Apologies!

[lp:~hikiko/compiz/compiz.shared-transform-ezoom]

3951. By Eleni Maria Stea on 2015-07-30

removed comment

Unmerged revisions

3951. By Eleni Maria Stea on 2015-07-30

removed comment

3950. By Eleni Maria Stea on 2015-05-29

renamed sh_transform to ezoom_transform

3949. By Eleni Maria Stea on 2015-05-12

added sh_transform member to gScreen to store transformations that
need to be exchanged between plugins (eg ezoom and unityshell), filled it
in ezoom

3948. By Eleni Maria Stea on 2015-05-12

local merge

=== modified file 'plugins/ezoom/src/ezoom.cpp'
--- plugins/ezoom/src/ezoom.cpp	2014-10-22 16:01:27 +0000
+++ plugins/ezoom/src/ezoom.cpp	2015-07-03 14:07:43 +0000
@@ -519,12 +519,16 @@
 
 	mask |= PAINT_SCREEN_TRANSFORMED_MASK;
 
+	gScreen->ezoom_transform = zTransform;
 	status = gScreen->glPaintOutput (sa, zTransform, region, output, mask);
 
 	drawCursor (output, transform);
     }
     else
+    {
+	gScreen->ezoom_transform = transform;
 	status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
+    }
 
     if (grabIndex)
 	drawBox (transform, output, box);

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2014-12-10 13:21:23 +0000
+++ plugins/opengl/include/opengl/opengl.h	2015-07-03 14:07:43 +0000
@@ -763,6 +763,11 @@
 	GLScreen (CompScreen *s);
 	~GLScreen ();
 
+	/* identity matrix, fill it and use it to exchange transformations
+	 * between plugins */
+
+	GLMatrix ezoom_transform;
+
 	CompOption::Vector & getOptions ();
         bool setOption (const CompString &name, CompOption::Value &value);
 

=== modified file 'plugins/opengl/src/vertexbuffer.cpp'
--- plugins/opengl/src/vertexbuffer.cpp	2014-10-30 12:47:25 +0000
+++ plugins/opengl/src/vertexbuffer.cpp	2015-07-03 14:07:43 +0000
@@ -621,7 +621,10 @@
 	glTexCoordPointer (2, GL_FLOAT, 0, &textureData[i][0]);
     }
 
-    glDrawArrays (primitiveType, vertexOffset, vertexData.size () / 3);
+    glDrawArrays (primitiveType, vertexOffset, maxVertices > 0 ?
+				    std::min (static_cast <int> (vertexData.size () / 3),
+					      maxVertices) :
+				    vertexData.size () / 3);
 
     glDisableClientState (GL_VERTEX_ARRAY);
     glDisableClientState (GL_NORMAL_ARRAY);

=== modified file 'plugins/td/src/3d.cpp'
--- plugins/td/src/3d.cpp	2013-05-12 05:02:40 +0000
+++ plugins/td/src/3d.cpp	2015-07-03 14:07:43 +0000
@@ -454,8 +454,10 @@
 
 		glLoadMatrixf (mTransform.getMatrix ());
 
+		GL::shaders = false;
 		tdw->gWindow->glPaint (tdw->gWindow->paintAttrib (), mTransform,
 				  infiniteRegion, newMask);
+		GL::shaders = true;
 
 		gScreen->glDisableOutputClipping ();