diff options
author | Bill Yi <byi@google.com> | 2014-10-22 08:46:29 -0700 |
---|---|---|
committer | Bill Yi <byi@google.com> | 2014-10-22 08:46:29 -0700 |
commit | 488d8a3b67937ec6a0898f4de82717b2021e81c2 (patch) | |
tree | 129170798d4012b8906613ae35a7af9f6c159c49 /opengl | |
parent | dc69376bd3d1c65ad19abfc036a85266b2199136 (diff) | |
parent | ca37eef61fa94932463f117ff1655a7e68f1827e (diff) | |
download | android_device_generic_goldfish-488d8a3b67937ec6a0898f4de82717b2021e81c2.tar.gz android_device_generic_goldfish-488d8a3b67937ec6a0898f4de82717b2021e81c2.tar.bz2 android_device_generic_goldfish-488d8a3b67937ec6a0898f4de82717b2021e81c2.zip |
Merge commit 'ca37eef61fa94932463f117ff1655a7e68f1827e' into HEAD
Diffstat (limited to 'opengl')
-rw-r--r-- | opengl/system/GLESv1_enc/gl_client_proc.h | 4 | ||||
-rw-r--r-- | opengl/system/GLESv1_enc/gl_enc.h | 6 | ||||
-rw-r--r-- | opengl/system/GLESv1_enc/gl_entry.cpp | 8 | ||||
-rw-r--r-- | opengl/system/GLESv2_enc/gl2_client_proc.h | 4 | ||||
-rw-r--r-- | opengl/system/GLESv2_enc/gl2_enc.h | 4 | ||||
-rw-r--r-- | opengl/system/GLESv2_enc/gl2_entry.cpp | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/opengl/system/GLESv1_enc/gl_client_proc.h b/opengl/system/GLESv1_enc/gl_client_proc.h index a188657..707c524 100644 --- a/opengl/system/GLESv1_enc/gl_client_proc.h +++ b/opengl/system/GLESv1_enc/gl_client_proc.h @@ -269,8 +269,8 @@ typedef void (gl_APIENTRY *glDeleteVertexArraysOES_client_proc_t) (void * ctx, G typedef void (gl_APIENTRY *glGenVertexArraysOES_client_proc_t) (void * ctx, GLsizei, GLuint*); typedef GLboolean (gl_APIENTRY *glIsVertexArrayOES_client_proc_t) (void * ctx, GLuint); typedef void (gl_APIENTRY *glDiscardFramebufferEXT_client_proc_t) (void * ctx, GLenum, GLsizei, const GLenum*); -typedef void (gl_APIENTRY *glMultiDrawArraysEXT_client_proc_t) (void * ctx, GLenum, GLint*, GLsizei*, GLsizei); -typedef void (gl_APIENTRY *glMultiDrawElementsEXT_client_proc_t) (void * ctx, GLenum, const GLsizei*, GLenum, const GLvoid**, GLsizei); +typedef void (gl_APIENTRY *glMultiDrawArraysEXT_client_proc_t) (void * ctx, GLenum, const GLint*, const GLsizei*, GLsizei); +typedef void (gl_APIENTRY *glMultiDrawElementsEXT_client_proc_t) (void * ctx, GLenum, const GLsizei*, GLenum, const GLvoid* const*, GLsizei); typedef void (gl_APIENTRY *glMultiDrawArraysSUN_client_proc_t) (void * ctx, GLenum, GLint*, GLsizei*, GLsizei); typedef void (gl_APIENTRY *glMultiDrawElementsSUN_client_proc_t) (void * ctx, GLenum, const GLsizei*, GLenum, const GLvoid**, GLsizei); typedef void (gl_APIENTRY *glRenderbufferStorageMultisampleIMG_client_proc_t) (void * ctx, GLenum, GLsizei, GLenum, GLsizei, GLsizei); diff --git a/opengl/system/GLESv1_enc/gl_enc.h b/opengl/system/GLESv1_enc/gl_enc.h index d8a23e4..2899b66 100644 --- a/opengl/system/GLESv1_enc/gl_enc.h +++ b/opengl/system/GLESv1_enc/gl_enc.h @@ -281,8 +281,8 @@ extern "C" { void glGenVertexArraysOES_enc(void *self , GLsizei n, GLuint* arrays); GLboolean glIsVertexArrayOES_enc(void *self , GLuint array); void glDiscardFramebufferEXT_enc(void *self , GLenum target, GLsizei numAttachments, const GLenum* attachments); - void glMultiDrawArraysEXT_enc(void *self , GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); - void glMultiDrawElementsEXT_enc(void *self , GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); + void glMultiDrawArraysEXT_enc(void *self , GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount); + void glMultiDrawElementsEXT_enc(void *self , GLenum mode, const GLsizei* count, GLenum type, const GLvoid* const* indices, GLsizei primcount); void glMultiDrawArraysSUN_enc(void *self , GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); void glMultiDrawElementsSUN_enc(void *self , GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); void glRenderbufferStorageMultisampleIMG_enc(void *self , GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); @@ -313,4 +313,4 @@ extern "C" { void glStartTilingQCOM_enc(void *self , GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); void glEndTilingQCOM_enc(void *self , GLbitfield preserveMask); }; -#endif
\ No newline at end of file +#endif diff --git a/opengl/system/GLESv1_enc/gl_entry.cpp b/opengl/system/GLESv1_enc/gl_entry.cpp index b43df09..ecc13f4 100644 --- a/opengl/system/GLESv1_enc/gl_entry.cpp +++ b/opengl/system/GLESv1_enc/gl_entry.cpp @@ -266,8 +266,8 @@ extern "C" { void glGenVertexArraysOES(GLsizei n, GLuint* arrays); GLboolean glIsVertexArrayOES(GLuint array); void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum* attachments); - void glMultiDrawArraysEXT(GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); - void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); + void glMultiDrawArraysEXT(GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount); + void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid*const* indices, GLsizei primcount); void glMultiDrawArraysSUN(GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); void glMultiDrawElementsSUN(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); void glRenderbufferStorageMultisampleIMG(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); @@ -1876,13 +1876,13 @@ void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum ctx->glDiscardFramebufferEXT(ctx, target, numAttachments, attachments); } -void glMultiDrawArraysEXT(GLenum mode, GLint* first, GLsizei* count, GLsizei primcount) +void glMultiDrawArraysEXT(GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount) { GET_CONTEXT; ctx->glMultiDrawArraysEXT(ctx, mode, first, count, primcount); } -void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount) +void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid* const* indices, GLsizei primcount) { GET_CONTEXT; ctx->glMultiDrawElementsEXT(ctx, mode, count, type, indices, primcount); diff --git a/opengl/system/GLESv2_enc/gl2_client_proc.h b/opengl/system/GLESv2_enc/gl2_client_proc.h index 4eeda70..1a9f696 100644 --- a/opengl/system/GLESv2_enc/gl2_client_proc.h +++ b/opengl/system/GLESv2_enc/gl2_client_proc.h @@ -168,8 +168,8 @@ typedef void (gl2_APIENTRY *glDeleteVertexArraysOES_client_proc_t) (void * ctx, typedef void (gl2_APIENTRY *glGenVertexArraysOES_client_proc_t) (void * ctx, GLsizei, GLuint*); typedef GLboolean (gl2_APIENTRY *glIsVertexArrayOES_client_proc_t) (void * ctx, GLuint); typedef void (gl2_APIENTRY *glDiscardFramebufferEXT_client_proc_t) (void * ctx, GLenum, GLsizei, const GLenum*); -typedef void (gl2_APIENTRY *glMultiDrawArraysEXT_client_proc_t) (void * ctx, GLenum, GLint*, GLsizei*, GLsizei); -typedef void (gl2_APIENTRY *glMultiDrawElementsEXT_client_proc_t) (void * ctx, GLenum, const GLsizei*, GLenum, const GLvoid**, GLsizei); +typedef void (gl2_APIENTRY *glMultiDrawArraysEXT_client_proc_t) (void * ctx, GLenum, const GLint*, const GLsizei*, GLsizei); +typedef void (gl2_APIENTRY *glMultiDrawElementsEXT_client_proc_t) (void * ctx, GLenum, const GLsizei*, GLenum, const GLvoid* const*, GLsizei); typedef void (gl2_APIENTRY *glGetPerfMonitorGroupsAMD_client_proc_t) (void * ctx, GLint*, GLsizei, GLuint*); typedef void (gl2_APIENTRY *glGetPerfMonitorCountersAMD_client_proc_t) (void * ctx, GLuint, GLint*, GLint*, GLsizei, GLuint*); typedef void (gl2_APIENTRY *glGetPerfMonitorGroupStringAMD_client_proc_t) (void * ctx, GLuint, GLsizei, GLsizei*, GLchar*); diff --git a/opengl/system/GLESv2_enc/gl2_enc.h b/opengl/system/GLESv2_enc/gl2_enc.h index b1b456a..f4f3f60 100644 --- a/opengl/system/GLESv2_enc/gl2_enc.h +++ b/opengl/system/GLESv2_enc/gl2_enc.h @@ -181,8 +181,8 @@ extern "C" { void glGenVertexArraysOES_enc(void *self , GLsizei n, GLuint* arrays); GLboolean glIsVertexArrayOES_enc(void *self , GLuint array); void glDiscardFramebufferEXT_enc(void *self , GLenum target, GLsizei numAttachments, const GLenum* attachments); - void glMultiDrawArraysEXT_enc(void *self , GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); - void glMultiDrawElementsEXT_enc(void *self , GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); + void glMultiDrawArraysEXT_enc(void *self , GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount); + void glMultiDrawElementsEXT_enc(void *self , GLenum mode, const GLsizei* count, GLenum type, const GLvoid* const* indices, GLsizei primcount); void glGetPerfMonitorGroupsAMD_enc(void *self , GLint* numGroups, GLsizei groupsSize, GLuint* groups); void glGetPerfMonitorCountersAMD_enc(void *self , GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters); void glGetPerfMonitorGroupStringAMD_enc(void *self , GLuint group, GLsizei bufSize, GLsizei* length, GLchar* groupString); diff --git a/opengl/system/GLESv2_enc/gl2_entry.cpp b/opengl/system/GLESv2_enc/gl2_entry.cpp index abd374b..b3ad229 100644 --- a/opengl/system/GLESv2_enc/gl2_entry.cpp +++ b/opengl/system/GLESv2_enc/gl2_entry.cpp @@ -165,8 +165,8 @@ extern "C" { void glGenVertexArraysOES(GLsizei n, GLuint* arrays); GLboolean glIsVertexArrayOES(GLuint array); void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum* attachments); - void glMultiDrawArraysEXT(GLenum mode, GLint* first, GLsizei* count, GLsizei primcount); - void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount); + void glMultiDrawArraysEXT(GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount); + void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid* const* indices, GLsizei primcount); void glGetPerfMonitorGroupsAMD(GLint* numGroups, GLsizei groupsSize, GLuint* groups); void glGetPerfMonitorCountersAMD(GLuint group, GLint* numCounters, GLint* maxActiveCounters, GLsizei counterSize, GLuint* counters); void glGetPerfMonitorGroupStringAMD(GLuint group, GLsizei bufSize, GLsizei* length, GLchar* groupString); @@ -1187,13 +1187,13 @@ void glDiscardFramebufferEXT(GLenum target, GLsizei numAttachments, const GLenum ctx->glDiscardFramebufferEXT(ctx, target, numAttachments, attachments); } -void glMultiDrawArraysEXT(GLenum mode, GLint* first, GLsizei* count, GLsizei primcount) +void glMultiDrawArraysEXT(GLenum mode, const GLint* first, const GLsizei* count, GLsizei primcount) { GET_CONTEXT; ctx->glMultiDrawArraysEXT(ctx, mode, first, count, primcount); } -void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid** indices, GLsizei primcount) +void glMultiDrawElementsEXT(GLenum mode, const GLsizei* count, GLenum type, const GLvoid* const* indices, GLsizei primcount) { GET_CONTEXT; ctx->glMultiDrawElementsEXT(ctx, mode, count, type, indices, primcount); |