diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 00:10:27 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 00:10:27 +0000 |
| commit | 26e14d18ae692d5e4af783bf92f33854bc20f86d (patch) | |
| tree | d1a03c976fd5f7fcb5630b52c771ad4db56a5000 /third_party/khronos | |
| parent | a446534de1a24cbfe8858a9958dd22383f1b49d1 (diff) | |
| download | chromium_src-26e14d18ae692d5e4af783bf92f33854bc20f86d.zip chromium_src-26e14d18ae692d5e4af783bf92f33854bc20f86d.tar.gz chromium_src-26e14d18ae692d5e4af783bf92f33854bc20f86d.tar.bz2 | |
Add gl bindings for ANGLE_instanced_arrays and ARB_instanced_arrays
BUG=93148
TEST=
Review URL: http://codereview.chromium.org/9348046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/khronos')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 18 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index c22ef1e..547518c 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -218,6 +218,11 @@ typedef void* GLeglImageOES; #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 #endif +/* GL_ANGLE_instanced_arrays */ +#ifndef GL_ANGLE_instanced_arrays +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE +#endif + /*------------------------------------------------------------------------* * APPLE extension tokens *------------------------------------------------------------------------*/ @@ -956,6 +961,19 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); #endif +/* GL_ANGLE_instanced_arrays */ +#ifndef GL_ANGLE_instanced_arrays +#define GL_ANGLE_instanced_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE(GLuint index, GLuint divisor); +GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei count, GLsizei primcount); +GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +#endif +typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); +typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +#endif + /*------------------------------------------------------------------------* * APPLE extension functions *------------------------------------------------------------------------*/ diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index c2b2769..6d30fdb 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -18,5 +18,6 @@ GLES2/gl2.h - Added GL_CONTEXT_LOST constant. GLES2/gl2ext.h - Added Chromium and Angle extensions. + - Added ANGLE_instanced_arrays EGL/eglplatform.h - Added EGLNative*Type for Mac. |