diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-10-31 10:55:06 +0100 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2014-11-25 12:31:48 -0800 |
| commit | 92a73be1a361353e0c3577002e477db68fa00d45 (patch) | |
| tree | 4f125a925a3fdfda5cdae222743ce0552bd10245 /emulator/opengl/host/libs/GLESv2_dec | |
| parent | c8f4ebe81beb0ee0a10d466bc5559fc0d9c783e8 (diff) | |
| download | sdk-92a73be1a361353e0c3577002e477db68fa00d45.zip sdk-92a73be1a361353e0c3577002e477db68fa00d45.tar.gz sdk-92a73be1a361353e0c3577002e477db68fa00d45.tar.bz2 | |
emulator/opengl: Fix glShaderSource() signature.
The glShaderSource() function really takes a 'const GLchar* const*' parameter,
not 'const GLchar**'. This creates issues when compiling the auto-generated
encoders created with the latest version of 'emugen' and the GL2 Khronos
headers.
This patch is used to fix the issue. Note that it requires defining a new type
in gl2.types, as well as fixing the signature of misc functions in the
translator.
Change-Id: I750f95f2e33d83b3b5563642ad7f87e4b8a37f35
Diffstat (limited to 'emulator/opengl/host/libs/GLESv2_dec')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/gl2.in | 2 | ||||
| -rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/gl2.types | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/emulator/opengl/host/libs/GLESv2_dec/gl2.in b/emulator/opengl/host/libs/GLESv2_dec/gl2.in index 916153b..925eb98 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/gl2.in +++ b/emulator/opengl/host/libs/GLESv2_dec/gl2.in @@ -96,7 +96,7 @@ GL_ENTRY(void, glRenderbufferStorage, GLenum target, GLenum internalformat, GLsi GL_ENTRY(void, glSampleCoverage, GLclampf value, GLboolean invert) GL_ENTRY(void, glScissor, GLint x, GLint y, GLsizei width, GLsizei height) GL_ENTRY(void, glShaderBinary, GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length) -GL_ENTRY(void, glShaderSource, GLuint shader, GLsizei count, const GLchar** string, const GLint* length) +GL_ENTRY(void, glShaderSource, GLuint shader, GLsizei count, const GLchar*const* string, const GLint* length) GL_ENTRY(void, glStencilFunc, GLenum func, GLint ref, GLuint mask) GL_ENTRY(void, glStencilFuncSeparate, GLenum face, GLenum func, GLint ref, GLuint mask) GL_ENTRY(void, glStencilMask, GLuint mask) diff --git a/emulator/opengl/host/libs/GLESv2_dec/gl2.types b/emulator/opengl/host/libs/GLESv2_dec/gl2.types index ab4eae3..2f5c0c3 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/gl2.types +++ b/emulator/opengl/host/libs/GLESv2_dec/gl2.types @@ -34,3 +34,4 @@ GLvoid** 32 0x%08x void* 32 0x%08x GLstr* 32 0x%08x GLvoidptr* 32 0x%08x +GLchar*const* 32 0x%08x |