diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-07-26 15:02:03 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-07-26 15:02:03 +0000 |
| commit | a9ebd7d3e5bd3e25eaa1602444d0bd05edfddcc3 (patch) | |
| tree | 960e128fd0f16fcfa5ba9043df003f1ca74cf454 | |
| parent | 6887a0c341bcc7983a726142294fc306ddc581a4 (diff) | |
Fix Android Build.
| -rw-r--r-- | Externals/GLES3/GLES3/gl3.h | 1 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/Externals/GLES3/GLES3/gl3.h b/Externals/GLES3/GLES3/gl3.h index 2360101b6d..e5bf8f5bfc 100644 --- a/Externals/GLES3/GLES3/gl3.h +++ b/Externals/GLES3/GLES3/gl3.h @@ -950,7 +950,6 @@ GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei widt /* OpenGL ES 3.0 */ GL_APICALL void GL_APIENTRY glReadBuffer (GLenum mode); -GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices); GL_APICALL void GL_APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); GL_APICALL void GL_APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); GL_APICALL void GL_APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp index 6b8b01562a..2759fd82ff 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.cpp @@ -30,6 +30,8 @@ PFNGLGETPROGRAMBINARYPROC glGetProgramBinary; PFNGLPROGRAMBINARYPROC glProgramBinary; PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; +PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; + PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex; PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding; @@ -86,6 +88,8 @@ namespace GLFunc LoadFunction("glGetProgramBinary", (void**)&glGetProgramBinary); LoadFunction("glProgramBinary", (void**)&glProgramBinary); LoadFunction("glProgramParameteri", (void**)&glProgramParameteri); + + LoadFunction("glDrawRangeElements", (void**)&glDrawRangeElements); LoadFunction("glGetUniformBlockIndex", (void**)&glGetUniformBlockIndex); LoadFunction("glUniformBlockBinding", (void**)&glUniformBlockBinding); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h index e8ff77690d..db1c7a1760 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLFunctions.h @@ -45,6 +45,9 @@ typedef void (*PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* par typedef void (*PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids); typedef void (*PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids); +// glDraw* +typedef void (*PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices); + // ptrs extern PFNGLBEGINQUERYPROC glBeginQuery; extern PFNGLENDQUERYPROC glEndQuery; @@ -71,6 +74,8 @@ extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary; extern PFNGLPROGRAMBINARYPROC glProgramBinary; extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; +extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements; + //Sampler extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf; extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri; |