From 40a6ef5c19b233de6d03fa3aac232ada41ce5ccd Mon Sep 17 00:00:00 2001 From: Pablo Ceballos Date: Thu, 24 Mar 2016 09:54:17 -0700 Subject: [PATCH] Update GLES NDK headers - Apply the proposed Khronos fix to the headers. - Rename from android-n to android-24. Bug 26832318 Change-Id: I6a07a68f3f2b7ec067ba3af46cab7fbd2c42a26d --- .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../symbols/libGLESv3.so.functions.txt | 0 .../symbols/libGLESv3.so.variables.txt | 0 .../include/GLES2/gl2.h | 6 +++- .../include/GLES2/gl2ext.h | 0 .../android-24/include/GLES2/gl2platform.h | 30 +++++++++++++++++++ .../include/GLES3/gl3.h | 8 +++-- .../include/GLES3/gl31.h | 10 +++++-- .../include/GLES3/gl32.h | 12 +++++--- .../android-24/include/GLES3/gl3ext.h | 24 +++++++++++++++ .../include/GLES3/gl3platform.h | 0 20 files changed, 80 insertions(+), 10 deletions(-) rename ndk/platforms/{android-n => android-24}/arch-arm/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-arm/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-arm64/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-arm64/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-mips/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-mips/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-mips64/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-mips64/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-x86/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-x86/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-x86_64/symbols/libGLESv3.so.functions.txt (100%) rename ndk/platforms/{android-n => android-24}/arch-x86_64/symbols/libGLESv3.so.variables.txt (100%) rename ndk/platforms/{android-n => android-24}/include/GLES2/gl2.h (99%) rename ndk/platforms/{android-n => android-24}/include/GLES2/gl2ext.h (100%) create mode 100644 ndk/platforms/android-24/include/GLES2/gl2platform.h rename ndk/platforms/{android-n => android-24}/include/GLES3/gl3.h (99%) rename ndk/platforms/{android-n => android-24}/include/GLES3/gl31.h (99%) rename ndk/platforms/{android-n => android-24}/include/GLES3/gl32.h (99%) create mode 100644 ndk/platforms/android-24/include/GLES3/gl3ext.h rename ndk/platforms/{android-n => android-24}/include/GLES3/gl3platform.h (100%) diff --git a/ndk/platforms/android-n/arch-arm/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-arm/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-arm/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-arm/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-arm/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-arm/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-arm/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-arm/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/arch-arm64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-arm64/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-arm64/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-arm64/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-arm64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-arm64/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-arm64/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-arm64/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/arch-mips/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-mips/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-mips/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-mips/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-mips/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-mips/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-mips/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-mips/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/arch-mips64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-mips64/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-mips64/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-mips64/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-mips64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-mips64/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-mips64/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-mips64/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/arch-x86/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-x86/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-x86/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-x86/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-x86/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-x86/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-x86/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-x86/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/arch-x86_64/symbols/libGLESv3.so.functions.txt b/ndk/platforms/android-24/arch-x86_64/symbols/libGLESv3.so.functions.txt similarity index 100% rename from ndk/platforms/android-n/arch-x86_64/symbols/libGLESv3.so.functions.txt rename to ndk/platforms/android-24/arch-x86_64/symbols/libGLESv3.so.functions.txt diff --git a/ndk/platforms/android-n/arch-x86_64/symbols/libGLESv3.so.variables.txt b/ndk/platforms/android-24/arch-x86_64/symbols/libGLESv3.so.variables.txt similarity index 100% rename from ndk/platforms/android-n/arch-x86_64/symbols/libGLESv3.so.variables.txt rename to ndk/platforms/android-24/arch-x86_64/symbols/libGLESv3.so.variables.txt diff --git a/ndk/platforms/android-n/include/GLES2/gl2.h b/ndk/platforms/android-24/include/GLES2/gl2.h similarity index 99% rename from ndk/platforms/android-n/include/GLES2/gl2.h rename to ndk/platforms/android-24/include/GLES2/gl2.h index e29a789ee..f64ec00bc 100644 --- a/ndk/platforms/android-n/include/GLES2/gl2.h +++ b/ndk/platforms/android-24/include/GLES2/gl2.h @@ -42,6 +42,10 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif +#if !defined(GL_GLES_PROTOTYPES) +#define GL_GLES_PROTOTYPES 1 +#endif + /* Generated on date 20151015 */ /* Generated C header for: @@ -520,7 +524,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); -#ifdef GL_GLEXT_PROTOTYPES +#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); diff --git a/ndk/platforms/android-n/include/GLES2/gl2ext.h b/ndk/platforms/android-24/include/GLES2/gl2ext.h similarity index 100% rename from ndk/platforms/android-n/include/GLES2/gl2ext.h rename to ndk/platforms/android-24/include/GLES2/gl2ext.h diff --git a/ndk/platforms/android-24/include/GLES2/gl2platform.h b/ndk/platforms/android-24/include/GLES2/gl2platform.h new file mode 100644 index 000000000..89d4d44dc --- /dev/null +++ b/ndk/platforms/android-24/include/GLES2/gl2platform.h @@ -0,0 +1,30 @@ +#ifndef __gl2platform_h_ +#define __gl2platform_h_ + +/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */ + +/* + * This document is licensed under the SGI Free Software B License Version + * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . + */ + +/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h + * + * Adopters may modify khrplatform.h and this file to suit their platform. + * You are encouraged to submit all modifications to the Khronos group so that + * they can be included in future versions of this file. Please submit changes + * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) + * by filing a bug against product "OpenGL-ES" component "Registry". + */ + +#include + +#ifndef GL_APICALL +#define GL_APICALL KHRONOS_APICALL +#endif + +#ifndef GL_APIENTRY +#define GL_APIENTRY KHRONOS_APIENTRY +#endif + +#endif /* __gl2platform_h_ */ diff --git a/ndk/platforms/android-n/include/GLES3/gl3.h b/ndk/platforms/android-24/include/GLES3/gl3.h similarity index 99% rename from ndk/platforms/android-n/include/GLES3/gl3.h rename to ndk/platforms/android-24/include/GLES3/gl3.h index 383230fe3..d51d2e658 100644 --- a/ndk/platforms/android-n/include/GLES3/gl3.h +++ b/ndk/platforms/android-24/include/GLES3/gl3.h @@ -42,6 +42,10 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif +#if !defined(GL_GLES_PROTOTYPES) +#define GL_GLES_PROTOTYPES 1 +#endif + /* Generated on date 20151015 */ /* Generated C header for: @@ -520,7 +524,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); -#ifdef GL_GLEXT_PROTOTYPES +#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); @@ -1094,7 +1098,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src); GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *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 void *pixels); diff --git a/ndk/platforms/android-n/include/GLES3/gl31.h b/ndk/platforms/android-24/include/GLES3/gl31.h similarity index 99% rename from ndk/platforms/android-n/include/GLES3/gl31.h rename to ndk/platforms/android-24/include/GLES3/gl31.h index 922a20a3d..9b89a0ac0 100644 --- a/ndk/platforms/android-n/include/GLES3/gl31.h +++ b/ndk/platforms/android-24/include/GLES3/gl31.h @@ -42,6 +42,10 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif +#if !defined(GL_GLES_PROTOTYPES) +#define GL_GLES_PROTOTYPES 1 +#endif + /* Generated on date 20151015 */ /* Generated C header for: @@ -520,7 +524,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); -#ifdef GL_GLEXT_PROTOTYPES +#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); @@ -1094,7 +1098,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src); GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *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 void *pixels); @@ -1445,7 +1449,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLi typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex); typedef void (GL_APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); GL_APICALL void GL_APIENTRY glDispatchComputeIndirect (GLintptr indirect); GL_APICALL void GL_APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect); diff --git a/ndk/platforms/android-n/include/GLES3/gl32.h b/ndk/platforms/android-24/include/GLES3/gl32.h similarity index 99% rename from ndk/platforms/android-n/include/GLES3/gl32.h rename to ndk/platforms/android-24/include/GLES3/gl32.h index 21bded589..a2c361191 100644 --- a/ndk/platforms/android-n/include/GLES3/gl32.h +++ b/ndk/platforms/android-24/include/GLES3/gl32.h @@ -42,6 +42,10 @@ extern "C" { #define GL_APIENTRYP GL_APIENTRY* #endif +#if !defined(GL_GLES_PROTOTYPES) +#define GL_GLES_PROTOTYPES 1 +#endif + /* Generated on date 20151015 */ /* Generated C header for: @@ -520,7 +524,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); -#ifdef GL_GLEXT_PROTOTYPES +#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); @@ -1094,7 +1098,7 @@ typedef void (GL_APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GL typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); typedef void (GL_APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glReadBuffer (GLenum src); GL_APICALL void GL_APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *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 void *pixels); @@ -1445,7 +1449,7 @@ typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLi typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex); typedef void (GL_APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); GL_APICALL void GL_APIENTRY glDispatchComputeIndirect (GLintptr indirect); GL_APICALL void GL_APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect); @@ -1770,7 +1774,7 @@ typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GL typedef void (GL_APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); typedef void (GL_APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -#ifdef GL_GLEXT_PROTOTYPES +#if GL_GLES_PROTOTYPES GL_APICALL void GL_APIENTRY glBlendBarrier (void); GL_APICALL void GL_APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); diff --git a/ndk/platforms/android-24/include/GLES3/gl3ext.h b/ndk/platforms/android-24/include/GLES3/gl3ext.h new file mode 100644 index 000000000..4d4ea96c4 --- /dev/null +++ b/ndk/platforms/android-24/include/GLES3/gl3ext.h @@ -0,0 +1,24 @@ +#ifndef __gl3ext_h_ +#define __gl3ext_h_ + +/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */ + +/* + * This document is licensed under the SGI Free Software B License Version + * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . + */ + +/* OpenGL ES 3 Extensions + * + * After an OES extension's interactions with OpenGl ES 3.0 have been documented, + * its tokens and function definitions should be added to this file in a manner + * that does not conflict with gl2ext.h or gl3.h. + * + * Tokens and function definitions for extensions that have become standard + * features in OpenGL ES 3.0 will not be added to this file. + * + * Applications using OpenGL-ES-2-only extensions should include gl2ext.h + */ + +#endif /* __gl3ext_h_ */ + diff --git a/ndk/platforms/android-n/include/GLES3/gl3platform.h b/ndk/platforms/android-24/include/GLES3/gl3platform.h similarity index 100% rename from ndk/platforms/android-n/include/GLES3/gl3platform.h rename to ndk/platforms/android-24/include/GLES3/gl3platform.h