Compiz

Merge lp://qastaging/~hikiko/compiz/compiz.3d-plugin-fixes into lp://qastaging/compiz/0.9.12

compiz.3d-plugin-fixes
Merge into 0.9.12

Proposed by Eleni Maria Stea on 2015-03-03

Status:

Merged

Approved by:

Christopher Townsend on 2015-04-01

Approved revision:

3930

Merged at revision:

3940

Proposed branch:

lp://qastaging/~hikiko/compiz/compiz.3d-plugin-fixes

Merge into:

lp://qastaging/compiz/0.9.12

Prerequisite:

lp://qastaging/~hikiko/compiz/compiz.glvector-fixes

Diff against target:

33 lines (+12/-0)

2 files modified

plugins/cube/src/cube.cpp (+10/-0)
plugins/cube/src/privates.h (+2/-0)

To merge this branch:

bzr merge lp://qastaging/~hikiko/compiz/compiz.3d-plugin-fixes

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
Christopher Townsend (community)			Approve on 2015-04-01
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-03-06
Stephen M. Webb		2015-03-03	Needs Fixing on 2015-03-03
Review via email: mp+251562@code.qastaging.launchpad.net

Commit message

glDisableOutputClipping was not implemented in 3d.cpp => a parent class glDisableOutputClipping was called, causing 2d clipping artifacts (the 3d cube was clipped and you couldn't see the windows move)

Description of the change

glDisableOutputClipping was not implemented in 3d.cpp => a parent class glDisableOutputClipping was called, causing 2d clipping artifacts (the 3d cube was clipped and you couldn't see the windows move)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:3929
http://jenkins.qa.ubuntu.com/job/compiz-ci/31/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/21
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/21

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Stephen M. Webb (bregma) wrote on 2015-03-03:

#

See inline comments.

review: Needs Fixing

lp://qastaging/~hikiko/compiz/compiz.3d-plugin-fixes updated on 2015-03-06

3930. By Eleni Maria Stea on 2015-03-06: used "#ifndef USE_GLES" around the non-GLES code.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

#

FAILED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/compiz-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/22/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Stephen M. Webb (bregma) wrote on 2015-03-06:

#

Ignore that Jenkins failure, it's just Jenkins being Jenkins as usual.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-06:

#

FAILED: Continuous integration, rev:3930
http://jenkins.qa.ubuntu.com/job/compiz-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-vivid-armhf-ci/23
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-vivid-i386-ci/23/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Christopher Townsend (townsend) wrote on 2015-04-01:

#

Ok, seems fine now. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Compiz Maintainers

Eleni Maria Stea

Tom Mirmar