History log of /frameworks/native/opengl/include/GLES2/gl2.h
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5b89ed60835bb369ec8d233c3c707f6147027994 24-Mar-2016 Pablo Ceballos <pceballos@google.com> Manually fix GLES headers

Apply the Khronos proposed fix to the GLES headers

Bug 26832318

Change-Id: I3f476d4b8dc4e1819afb9e791da178417e5cb427
4690754ec38f77431431910ce878850e1c60ab79 27-Oct-2015 Pablo Ceballos <pceballos@google.com> opengl: Update headers and registry and regenerate *api.in

- Update the registry xml files and python scripts in glgen2. Took
r32166 from:

- Update the GLES headers (and add gl32.h). Took r32166 from:

- Include gl32.h in libs/hooks.h

- Update glgen2/glgen.py to properly handle glPathGlyphIndexRangeNV
which uses an explicit array parameter (and is the only GL extension
that does this). This modification also fixes a bunch of whitespace
issues in the *.in files.

- Get rid of the remaining bits of glTrace code in glgen2/glgen.py

- Regenerate the *.in files with glgen2

- The official glext.h hasn't been updated and differs from the
registry in the second to last argument to glMultiDrawElementsEXT.
This file was previously modified to match the registry and this
modification has been carried forward in this commit.

- getProcAddress.cpp was failing to compile for ARM because the
inline assembly for loading the function pointer now exceeds the
limit of 4095 for an immediate offset to the ldr instruction on ARM.
Modify it to instead load the offset into a register and add it with
an add instruction before the ldr instruction.

- Khronos has added #ifdef GL_GLEXT_PROTOTYPES guards to the function
prototypes in gl2/3.h. In order to keep existing code compiling add
#define GL_GLEXT_PROTOTYPES to include/KHR/khrplatform.h for now.
This should be fixed upstream and when it is this can be removed.

Change-Id: I952ace43879557d7c363810b83d65159ad2ad1e3
3667e338629cb51683bd7a9a184180e2131ff2c7 18-May-2014 Jesse Hall <jessehall@google.com> opengl: Update registry and headers from Khronos

gl.xml @ r26697:

GLES headers @ r26698:

Bug: 15028495
Change-Id: I57e0d8caac2bc2edb10c8252e06ffdb9a5ccf48b
3703f7f014846b8bf83e08a8bf25450dd0dcd7af 14-May-2014 Jesse Hall <jessehall@google.com> opengl: Update GLES headers and generate *.in from registry XML

Import GLES headers from Khronos SVN r26322:

There are many non-functional whitespace and parameter name changes
included here. These were introduced upstream when converting from the
old .spec registry to the new XML registry.

There are also some new extensions added. Unfortunately there isn't a
version of the XML that matches the headers the previous versions of
the *.in files were generated from, so I can't separate out the
non-functional changes from the new extensions (other than temporarily
hacking them out of the XML). See below for a list.

Finally, I had to hack the official glext.h. Khronos hasn't updated
the official GLES1 headers since switching to the XML registry, and
there is one critical difference: a "const void**" parameter in the
official header is "const void* const*" in the registry. I changed the
header to avoid build errors with code generated from the registry.

Dependencies on the *.in files required manually updating some
GLES_trace/ files as well:

- gltrace_api.{h,cpp} must be manually re-generated using
- New GL prototypes must be manually added to gltrace.proto.
- gltrace.pb.{h,cpp} must be regenerated using aprotoc (see dev.make)

New GLES extensions in libs/GLES_CM/glext_api.in:
- GL_OES_byte_coordinates
- GL_EXT_map_buffer_range
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync

New GLES2 extensions in libs/GLES2/gl2ext_api.in:
- GL_KHR_blend_equation_advanced
- GL_KHR_debug
- GL_OES_sample_shading
- GL_OES_texture_storage_multisample_2d_array
- GL_EXT_disjoint_timer_query
- GL_EXT_draw_buffers
- GL_EXT_draw_instanced
- GL_EXT_instanced_arrays
- GL_EXT_map_buffer_range
- GL_EXT_map_buffer_range
- GL_EXT_multiview_draw_buffers
- GL_EXT_separate_shader_objects
- GL_ANGLE_instanced_arrays
- GL_ANGLE_translated_shader_source
- GL_APPLE_copy_texture_levels
- GL_APPLE_sync
- GL_INTEL_performance_query
- GL_NV_blend_equation_advanced
- GL_NV_copy_buffer
- GL_NV_draw_instanced
- GL_NV_framebuffer_blit
- GL_NV_framebuffer_multisample
- GL_NV_instanced_arrays
- GL_NV_non_square_matrices

Bug: 15028495
Change-Id: I902517c23354e14f9c63b1584db286d682315bb5
2b2ac210786c71bdd0ea5924d734a4b49c4a584e 20-May-2014 Jesse Hall <jessehall@google.com> Revert "Update GLES headers from Khronos SVN r26322"

This reverts commit 20670e33c76a32370695a82a3e7f2fb30be30608.

Change-Id: Iae3dfbaf852ff1b6906af1d5508c2baf1173b481
20670e33c76a32370695a82a3e7f2fb30be30608 14-May-2014 Jesse Hall <jessehall@google.com> Update GLES headers from Khronos SVN r26322

Public registry is:

Bug: 15028495
Change-Id: I2269a6a2486c34b6a9e378d4a25a41492d531c81
61d1b812137b7f3a877e855f9a088be307ec11b6 08-Feb-2013 Jesse Hall <jessehall@google.com> Import OpenGL ES 3.0 headers from Khronos SVN

Add MODULE_LICENSE_MIT: The GLES headers use an MIT license or a
slight variant of it (the "SGI Free Software License B version 2.0",

Change-Id: Ic8f946341cdd0d579f51b6f7a3ee109cd31b1691
7c95911157999d30fbadf8f964155396d17c49da 21-Jan-2013 Alistair Strachan <alistair.strachan@imgtec.com> Import constness fix from gl3.h into gl2.h.

This change has been made in Khronos SVN for GLES2 already, however it
is mildly controversial and discussion is on-going.

This change is necessary for Android because otherwise applications
cannot include both GLES2/gl2.h and GLES3/gl3.h as the glShaderSource()
prototype mismatches. Native programs may include framework headers
(which now include GLES3 headers only) but already have included GLES2
headers, creating an incompatibility.

Change-Id: I70a4075e079ee063e76cef5a227abb0ae70aebb4
300ad09822db1013d9f28c4bca3680f865533ab6 06-Nov-2012 Andrew Hsieh <andrewhsieh@google.com> Fix return type of glGetAttribLocation and glGetUniformLocation

from int to GLint.


Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
8f62c3031e0c8297d3fa1593430ab402cf6a776f 10-Jun-2010 Mathias Agopian <mathias@google.com> update the OpenGL ES headers to the latest

Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
a3d66a834f7e6796003684652d8aef13fa6345cd 28-May-2009 Mathias Agopian <mathias@google.com> minor modifications to the official GLES 2.x headers

- changed glTexImage2D() declaration so it matches that of GLES 1.x; otherwise we can't include both headers (!!!)
- added parameter names to the declaration of some extensions (this is needed by glapigen and glentrygen)
48efd950151369a5c049c8a92f36663a88206b4e 28-May-2009 Mathias Agopian <mathias@google.com> add GLES 2.x headers