Merge lp:~gebner/compiz/compiz.vertexbuffer-autoprogram-uniform-segfault into lp:compiz/0.9.9
Status: | Superseded |
---|---|
Proposed branch: | lp:~gebner/compiz/compiz.vertexbuffer-autoprogram-uniform-segfault |
Merge into: | lp:compiz/0.9.9 |
Diff against target: |
12 lines (+1/-1) 1 file modified
plugins/opengl/src/vertexbuffer.cpp (+1/-1) |
To merge this branch: | bzr merge lp:~gebner/compiz/compiz.vertexbuffer-autoprogram-uniform-segfault |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Needs Resubmitting | ||
Sam Spilsbury | Approve | ||
Review via email: mp+156313@code.launchpad.net |
This proposal has been superseded by a proposal from 2013-04-02.
Commit message
Adding a uniform to a GLVertexBuffer that uses AutoProgram causes compiz to segfault.
Example:
gWindow-
gWindow-
// segfault happens later in PrivateVertexBu
The patch modifies PrivateVertexBu
(LP: #1162598)
Description of the change
Adding a uniform to a GLVertexBuffer that uses AutoProgram causes compiz to segfault.
Example:
gWindow-
gWindow-
// segfault happens later in PrivateVertexBu
The patch modifies PrivateVertexBu
This feature is used in a plugin for full-screen color management, compiz-cms[1], where the unit of a color transformation texture is passed as a uniform.
Unmerged revisions
- 3645. By Gabriel Ebner
-
(LP: #1162598). Fixes: https:/
/bugs.launchpad .net/bugs/ 1162598. - 3644. By Gabriel Ebner
-
OpenGL plugin:
Allow uniforms for automatically generated programs in
PrivateVertexBuffer::render.
This makes sense, thanks.
This reminds me that I need to fix the VertexBuffer class to behave in a more sane way when it comes to having no active program set. At the moment it just crashes if you don't call setProgram or setAutoProgram. I remember I wanted to enforce something in its constructor, but at the time didn't want to break ABI. I've filed bug 1162597 about that.
One more thing before we merge this - can you add commit metadata to link this to a bug? I didn't see anything, so I've filed bug 1162598. You can link it by doing this:
bzr commit --empty --fixes lp:1162598
bzr push
On another note, nice work with the color management plugin. If you want it to be included in-tree, just file a bug about it on launchpad and we'll do the paperwork to get it in.