Unity

Merge lp://qastaging/~3v1n0/unity/fix-nvidia-glDrawArrays-crash into lp://qastaging/unity

fix-nvidia-glDrawArrays-crash
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2012-08-01

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2012-08-03

Approved revision:

no longer in the source branch.

Merged at revision:

2536

Proposed branch:

lp://qastaging/~3v1n0/unity/fix-nvidia-glDrawArrays-crash

Merge into:

lp://qastaging/unity

Diff against target:

31 lines (+14/-0)

1 file modified

plugins/unityshell/src/unityshell.cpp (+14/-0)

To merge this branch:

bzr merge lp://qastaging/~3v1n0/unity/fix-nvidia-glDrawArrays-crash

Related bugs:

Bug #980663: Compiz won't start if "unredirect fullscreen windows" is enabled	High	Fix Released
Bug #982626: [nvidia] compiz crashed with SIGSEGV in nux::GraphicsEngine::QRP_GLSL_Color() from nux::GraphicsEngine::QRP_Color() from nux::BasePainter::PaintBackground	Critical	Fix Released
Bug #1031554: [nvidia] unity crashed in nux::GraphicsEngine::QRP_GLSL_1Tex (glDrawArrays)	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Needs Fixing on 2012-08-01
Daniel van Vugt			Approve on 2012-08-01
Sam Spilsbury (community)		2012-08-01	Approve on 2012-08-01
Review via email: mp+117559@code.qastaging.launchpad.net

Commit message

unityshell: fix the nvidia crash on glDrawArrays disabling/enabling the client state on nuxPrologue/Epilogue (LP: #982626) (LP: #1031554)

Description of the change

Fix some crashes with the NVIDIA driver, happening on glDrawArray call.
Thanks to Sam for the hint.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-08-01:

Test coverage would be nice so that people don't accidentally nuke this code, though it would kinda involve wrapping those gl calls. Dunno if we want to do that.

review: Approve

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-08-01:

Works for me. Crash fixed.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-08-01:

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/984/console reported an error when processing this lp:~3v1n0/unity/fix-nvidia-glDrawArrays-crash branch.
Not merging it.