Merge lp:~azzar1/unity/lp-1485727 into lp:unity

[Andrea Azzarone]

Make sure to restore the state before the call to glDisable(GL_SCISSOR_TEST).

So basically the problem was that we were calling restore_state() after the call to glDisable(GL_SCISSOR_TEST). Because we want to be sure that GL_SCISSOR_TEST is diabled we need to do that after calling restore_state().

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

Yes, WorksForMe!

Waiting Eleni for final approval.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4009
http://jenkins.qa.ubuntu.com/job/unity-ci/1295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/73/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/71
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/71/console

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

review: Needs Fixing (continuous-integration)

[Eleni Maria Stea (hikiko)]

Hey, good job! That 2D clipping again... :)

Just a minor "fix": http://pastebin.ubuntu.com/12425108/

It's better to push the Modelview matrix at the end of save_state() to avoid the double call to glMatrixMode. The result will be exactly the same.

Apart from that, cool! :-D

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Hey, good job! That 2D clipping again... :)
>
> Just a minor "fix": http://pastebin.ubuntu.com/12425108/
>
> It's better to push the Modelview matrix at the end of save_state() to avoid
> the double call to glMatrixMode. The result will be exactly the same.
>
> Apart from that, cool! :-D

Done!

[Eleni Maria Stea (hikiko)]

Cool! :D

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4010
http://jenkins.qa.ubuntu.com/job/unity-ci/1296/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/74/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/72
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/72/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-09-10 15:37:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-09-16 15:13:34 +0000
@@ -91,12 +91,12 @@
 #ifndef USE_GLES
   glPushAttrib(GL_ALL_ATTRIB_BITS);
 
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
   glMatrixMode(GL_PROJECTION);
   glPushMatrix();
   glMatrixMode(GL_TEXTURE);
   glPushMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
 #endif
 }
 
@@ -687,9 +687,10 @@
   glDepthRangef(0, 1);
 #endif
 
+  restore_state();
+
   gScreen->resetRasterPos();
   glDisable(GL_SCISSOR_TEST);
-  restore_state();
 }
 
 void UnityScreen::setPanelShadowMatrix(GLMatrix const& matrix)