Merge lp:~compiz-team/compiz/compiz.fix_1095915 into lp:compiz/0.9.9

[Sam Spilsbury]

Fix definition of glShaderSource function pointer.

Its GLvoid glShaderSource (GLuint, GLsizei, const GLchar * const *, const GLint *); in the header file, not GLvoid glShaderSource (GLuint, GLsizei, const GLchar **, const GLint *); like the specification.

Use a function pointer cast to work around it.

(LP: #1095915)

Fix definition of glShaderSource function pointer.

Its GLvoid glShaderSource (GLuint, GLsizei, const GLchar * const *, const GLint *); in the header file, not GLvoid glShaderSource (GLuint, GLsizei, const GLchar **, const GLint *); like the specification.

[Daniel van Vugt (vanvugt)]

review: Approve

[Daniel van Vugt (vanvugt)]

BUILD_GLES:

/home/dan/bzr/compiz/tmp.915/plugins/opengl/src/screen.cpp: In member function ‘bool GLScreen::glInitContext(XVisualInfo*)’:
/home/dan/bzr/compiz/tmp.915/plugins/opengl/src/screen.cpp:547:24: error: invalid conversion from ‘void (*)(GLuint, GLsizei, const GLchar**, const GLint*) {aka void (*)(unsigned int, int, const char**, const int*)}’ to ‘GL::GLShaderSourceProc {aka void (*)(unsigned int, int, const char* const*, const int*)}’ [-fpermissive]

review: Needs Fixing

[lp:~compiz-team/compiz/compiz.fix_1095915]

3536. By Sam Spilsbury on 2013-01-04

Cast to GLShaderSourceProc instead.

Its evil but not that evil

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3535
http://jenkins.qa.ubuntu.com/job/compiz-ci/341/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/341/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/341//rebuild/?

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

It seems like the function signature changed between mesa versions incorrectly.

I've filed a bug upstream and am using a function pointer cast to work around it for now.

[Sam Spilsbury (smspillaz)]

Fixing the useless indentation change now ... 2 minutes ...

[lp:~compiz-team/compiz/compiz.fix_1095915]

3537. By Sam Spilsbury on 2013-01-04

Remove indentation change

[Daniel van Vugt (vanvugt)]

Much nicer. Fix indentation change?

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Ah you did it

[Daniel van Vugt (vanvugt)]

GLES is happy on quantal now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3536
http://jenkins.qa.ubuntu.com/job/compiz-ci/343/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/343/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/343//rebuild/?

review: Approve (continuous-integration)

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2013-01-01 09:41:41 +0000
+++ plugins/opengl/src/screen.cpp	2013-01-04 07:52:22 +0000
@@ -544,7 +544,7 @@
     GL::getProgramiv = glGetProgramiv;
     GL::getProgramInfoLog = glGetProgramInfoLog;
     GL::createShader = glCreateShader;
-    GL::shaderSource = glShaderSource;
+    GL::shaderSource = (GL::GLShaderSourceProc) glShaderSource;
     GL::compileShader = glCompileShader;
     GL::createProgram = glCreateProgram;
     GL::attachShader = glAttachShader;