diff options
| author | Nicolai Hähnle <[email protected]> | 2017-06-10 20:46:27 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-06-30 15:29:50 +0200 |
| commit | 7fd08177a631a6d4223d79d71a299d61870f9485 (patch) | |
| tree | 21054496b07f4c0625c9193f69776834d2567627 /include/GLES2/gl2.h | |
| parent | 165e704719b85cb43156f517803dd9a1f0187519 (diff) | |
Update Khronos-supplied headers
Taken from commit 676834dd529d620ee25090e738d2607dfde003d8
of https://github.com/KhronosGroup/OpenGL-Registry.git
v2:
- keep the BUILDING_MESA bits (Matt)
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'include/GLES2/gl2.h')
| -rw-r--r-- | include/GLES2/gl2.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h index 57e1b50ccc7..8ba907c892c 100644 --- a/include/GLES2/gl2.h +++ b/include/GLES2/gl2.h @@ -6,7 +6,7 @@ extern "C" { #endif /* -** Copyright (c) 2013-2016 The Khronos Group Inc. +** Copyright (c) 2013-2017 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -31,9 +31,7 @@ extern "C" { ** This header is generated from the Khronos OpenGL / OpenGL ES XML ** API Registry. The current version of the Registry, generator scripts ** used to make the header, and the header can be found at -** http://www.opengl.org/registry/ -** -** Khronos $Revision: 32749 $ on $Date: 2016-04-28 09:03:03 -0700 (Thu, 28 Apr 2016) $ +** https://github.com/KhronosGroup/OpenGL-Registry */ #include <GLES2/gl2platform.h> @@ -42,7 +40,11 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20160428 */ +#ifndef GL_GLES_PROTOTYPES +#define GL_GLES_PROTOTYPES 1 +#endif + +/* Generated on date 20170606 */ /* Generated C header for: * API: gles2 @@ -520,6 +522,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GL typedef void (GL_APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); typedef void (GL_APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height); +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); @@ -662,6 +665,7 @@ GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); +#endif #endif /* GL_ES_VERSION_2_0 */ #ifdef __cplusplus |