isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-04 09:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext-functions: Don't assume GLchar typedef

Browse Source 
We shouldn't assume the GLchar is a valid typedef with all GL headers
when declaring all the symbols in cogl-ext-functions.h to lookup. GLchar
may not be avilable with gles1 for example so we were seeing build
failures. The patch simply replaces occurrences of GLchar with char.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-08-04 14:32:23 +01:00
parent 2ac4002084
commit b2964b6910
1 changed files with 5 additions and 5 deletions

10
cogl/cogl-ext-functions.h

@ -381,7 +381,7 @@ COGL_EXT_FUNCTION (GLuint, glCreateShader,
COGL_EXT_FUNCTION (void, glShaderSource, COGL_EXT_FUNCTION (void, glShaderSource,
(GLuint shader, (GLuint shader,
GLsizei count, GLsizei count,
const GLchar **string, const char **string,
const GLint *length)) const GLint *length))
COGL_EXT_FUNCTION (void, glCompileShader, COGL_EXT_FUNCTION (void, glCompileShader,
(GLuint shader)) (GLuint shader))
@ -396,14 +396,14 @@ COGL_EXT_FUNCTION (void, glUseProgram,
(GLuint program)) (GLuint program))
COGL_EXT_FUNCTION (GLint, glGetUniformLocation, COGL_EXT_FUNCTION (GLint, glGetUniformLocation,
(GLuint program, (GLuint program,
const GLchar *name)) const char *name))
COGL_EXT_FUNCTION (void, glDeleteProgram, COGL_EXT_FUNCTION (void, glDeleteProgram,
(GLuint program)) (GLuint program))
COGL_EXT_FUNCTION (void, glGetShaderInfoLog, COGL_EXT_FUNCTION (void, glGetShaderInfoLog,
(GLuint shader, (GLuint shader,
GLsizei maxLength, GLsizei maxLength,
GLsizei *length, GLsizei *length,
GLchar *infoLog)) char *infoLog))
COGL_EXT_FUNCTION (void, glGetShaderiv, COGL_EXT_FUNCTION (void, glGetShaderiv,
(GLuint shader, (GLuint shader,
GLenum pname, GLenum pname,
@ -514,13 +514,13 @@ COGL_EXT_FUNCTION (void, glGetProgramInfoLog,
(GLuint program, (GLuint program,
GLsizei bufSize, GLsizei bufSize,
GLsizei *length, GLsizei *length,
GLchar *infoLog)) char *infoLog))
COGL_EXT_FUNCTION (void, glVertexAttrib4f, COGL_EXT_FUNCTION (void, glVertexAttrib4f,
(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
COGL_EXT_FUNCTION (GLint, glGetAttribLocation, COGL_EXT_FUNCTION (GLint, glGetAttribLocation,
(GLuint program, const GLchar *name)) (GLuint program, const char *name))
COGL_EXT_END () COGL_EXT_END ()