Compiz

Merge lp:~compiz-team/compiz/fix-1048505 into lp:compiz/0.9.9

  1. fix-1048505
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3534
Merged at revision: 3534
Proposed branch: lp:~compiz-team/compiz/fix-1048505
Merge into: lp:compiz/0.9.9
Diff against target: 21 lines (+4/-0)
1 file modified
plugins/firepaint/src/firepaint.cpp (+4/-0)
To merge this branch: bzr merge lp:~compiz-team/compiz/fix-1048505
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+141705@code.launchpad.net

Commit message

Added missing glEnable/glDisableClientState calls for GL_TEXTURE_COORD_ARRAY
and GL_VERTEX_ARRAY to make firepaint work with the new codebase.
(LP: #1048505)
Author: Michail Bitzes

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Works for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/firepaint/src/firepaint.cpp'
2--- plugins/firepaint/src/firepaint.cpp 2012-12-01 17:46:23 +0000
3+++ plugins/firepaint/src/firepaint.cpp 2013-01-03 06:11:29 +0000
4@@ -260,6 +260,8 @@
5 }
6 }
7
8+ glEnableClientState (GL_VERTEX_ARRAY);
9+ glEnableClientState (GL_TEXTURE_COORD_ARRAY);
10 glEnableClientState (GL_COLOR_ARRAY);
11
12 glTexCoordPointer (2, GL_FLOAT, 2 * sizeof (GLfloat), coords_cache.cache);
13@@ -280,6 +282,8 @@
14 glColorPointer (4, GL_FLOAT, 4 * sizeof (GLfloat), colors_cache.cache);
15 glDrawArrays (GL_QUADS, 0, numActive);
16 glDisableClientState (GL_COLOR_ARRAY);
17+ glDisableClientState (GL_TEXTURE_COORD_ARRAY);
18+ glDisableClientState (GL_VERTEX_ARRAY);
19
20 glPopMatrix ();
21 glColor4usv (defaultColor);

Subscribers

People subscribed via source and target branches