Compiz

Merge lp://qastaging/~hikiko/compiz/compiz.use-pipeline-with-3d-clipping into lp://qastaging/compiz/0.9.12

compiz.use-pipeline-with-3d-clipping
Merge into 0.9.12

Proposed by Eleni Maria Stea on 2015-04-28

Status:

Merged

Approved by:

Stephen M. Webb on 2015-07-24

Approved revision:

3969

Merged at revision:

3964

Proposed branch:

lp://qastaging/~hikiko/compiz/compiz.use-pipeline-with-3d-clipping

Merge into:

lp://qastaging/compiz/0.9.12

Diff against target:

119 lines (+21/-12)

3 files modified

plugins/cube/src/cube.cpp (+10/-8)
plugins/opengl/src/vertexbuffer.cpp (+4/-1)
plugins/td/src/3d.cpp (+7/-3)

To merge this branch:

bzr merge lp://qastaging/~hikiko/compiz/compiz.use-pipeline-with-3d-clipping

Related bugs:

Bug #1024208: [regression-r3320][GLES] td plugin (3d Windows for the cube) has severe clipping/transformation glitches	High	In Progress
Bug #1395697: compiz 0.9.12 : cube displays garbage when 3D Windows plugin is enabled	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Stephen M. Webb		2015-04-28	Approve on 2015-07-24
PS Jenkins bot (community)	continuous-integration		Approve on 2015-07-22
MC Return			Needs Information on 2015-04-29
Review via email: mp+257611@code.qastaging.launchpad.net

Commit message

It fixes the 3d windows plugin.
Problem:
The 3d clipping is performed in viewing space (modelview transformation) and should be done inside the shader when we use shaders otherwise the viewing space pipeline operations will be ignored. Compiz used to perform the clipping inside the td plugin using pipeline functions, then it was loading a generic shader program (no clipping operations) to render the windows and then it rendered the 3d quads around the windows using the pipeline (so these were clipped correctly).

Fix:
Added a variable that indicates when to load the shaders and when render using the fixed functions pipeline and use the fixed functions pipeline to render between glEnableOutputClipping and glDisableOutputClipping.

+small fix in the legacyRendering (pipeline)

Description of the change

+small fix in the legacyRendering (pipeline)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-28:

PASSED: Continuous integration, rev:3948
http://jenkins.qa.ubuntu.com/job/compiz-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/42

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

review: Approve (continuous-integration)

Revision history for this message

MC Return (mc-return) wrote on 2015-04-29:

This unfortunately does not work here.

While the 3d-window effect somehow works, I still get every window rendered multiple times (one copy for each virtual desktop) and when leaving the cube the desktop starts to flicker and gets unusable :(

I want to note that, even without your fixes, sticky windows are the only ones that are rendered and clipped correctly.

Maybe someone else could test that one also ?

review: Abstain

Revision history for this message

Eleni Maria Stea (hikiko) wrote on 2015-04-29:

This probably happens because you don't have all the other necessary fixes on unity please try to compile this unity branch with compiz and I believe you won't get these problems anymore: https://code.launchpad.net/~hikiko/unity/unity.save-compiz-state-before-rendering

Revision history for this message

Eleni Maria Stea (hikiko) wrote on 2015-04-29:

https://www.youtube.com/watch?v=VUZseeDfMYo here's what I see when I use the above branch + this one together, could you please test it again if you have some time?

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) on 2015-04-29:

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-29:

PASSED: Continuous integration, rev:3949
http://jenkins.qa.ubuntu.com/job/compiz-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/43

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

review: Approve (continuous-integration)

Revision history for this message

MC Return (mc-return) wrote on 2015-04-29:

> This probably happens because you don't have all the other necessary fixes on
> unity
Well, I am not using Unity here, so it cannot be the cause.

Revision history for this message

MC Return (mc-return) wrote on 2015-04-29:

> https://www.youtube.com/watch?v=VUZseeDfMYo here's what I see when I use the
> above branch + this one together, could you please test it again if you have
> some time?

This looks much better than the version I get -
there might be some OpenGL state weirdness some other plugin is causing involved here as well, as I am additionally running many non-Ubuntu-default plugins...

Does it work for you without enabled Unityshell plugin as well ?

review: Needs Information

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-29:

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

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

review: Approve (continuous-integration)

Revision history for this message

Eleni Maria Stea (hikiko) wrote on 2015-04-30:

> > https://www.youtube.com/watch?v=VUZseeDfMYo here's what I see when I use the
> > above branch + this one together, could you please test it again if you have
> > some time?
>
> This looks much better than the version I get -
> there might be some OpenGL state weirdness some other plugin is causing
> involved here as well, as I am additionally running many non-Ubuntu-default
> plugins...
>
> Does it work for you without enabled Unityshell plugin as well ?

The 3d windows work for me even when the unityshell plugin is disabled but sometimes I see other issues like flickering and non-cleared buffers (only when I disable the unityshell). I'll get a look to see if I can fix them in another branch, but the windows seem to work fine as you can see in the pictures:

https://i.imgur.com/qeKVAC1.jpg
https://i.imgur.com/VpSSLQ3.jpg

(sorry, the pics are from my mobile, I couldn't get better screenshots quickly without unityshell :p)

I've noticed, there are problems with other plugins too, and we are trying to fix them, I suspect that it's some other plugin combination that causes the problems you see in your desktop.

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2015-05-14:

Mh, I've tried this (together with the unity change), but it doesn't seem to work properly here (radeon): http://i.imgur.com/eAvb5O3.png and http://i.imgur.com/HH6kvYs.png