OSDN Git Service

opengl: Update GLES headers and generate *.in from registry XML
authorJesse Hall <jessehall@google.com>
Wed, 14 May 2014 04:52:56 +0000 (21:52 -0700)
committerJesse Hall <jessehall@google.com>
Wed, 21 May 2014 21:58:00 +0000 (14:58 -0700)
commit3703f7f014846b8bf83e08a8bf25450dd0dcd7af
treedee600864f09f5c423b5078c276ddfc533684c84
parentdf7d6615335119bb1ce6eb825cd705ea94142a6b
opengl: Update GLES headers and generate *.in from registry XML

Import GLES headers from Khronos SVN r26322:
https://cvs.khronos.org/svn/repos/registry/trunk/public/gles/api

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
  tools/genapi.py.
- 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
20 files changed:
opengl/include/GLES/glext.h
opengl/include/GLES2/gl2.h
opengl/include/GLES2/gl2ext.h
opengl/include/GLES2/gl2platform.h
opengl/include/GLES3/gl3.h
opengl/libs/GLES2/gl2_api.in
opengl/libs/GLES2/gl2ext_api.in
opengl/libs/GLES_CM/gl_api.in
opengl/libs/GLES_CM/glext_api.in
opengl/libs/GLES_trace/gltrace.proto
opengl/libs/GLES_trace/src/gltrace.pb.cpp
opengl/libs/GLES_trace/src/gltrace.pb.h
opengl/libs/GLES_trace/src/gltrace_api.cpp
opengl/libs/GLES_trace/src/gltrace_api.h
opengl/libs/GLES_trace/tools/genapi.py
opengl/libs/entries.in
opengl/libs/enums.in
opengl/libs/trace.in
opengl/tools/glgen2/.gitignore [new file with mode: 0644]
opengl/tools/glgen2/glgen.py [new file with mode: 0755]