Update the Khronos EGL and GLES* header files.
The latest Khronos header file contents are used. Some
not-yet-registered Android extensions are added in, along with a few
data types that were accidentally deleted from "GLES/gl.h". Note that
Khronos rearranged some of the content.
In addition, a repeat of a 2012 fix was required to avoid ANativeWindow
being declared twice during the compilation of source files which also
include "window.h". Both "window.h" and "native_window.h" contain the
following line: typedef struct ANativeWindow ANativeWindow;
I tested this by building Android as well as other source that includes
"window.h", and carefully compared diff's of the old and new content.
Bug: None
Test: Built Android
Change-Id: I5f908f88923378e4d121dfd5fbc11e4f210cbb2a
diff --git a/opengl/include/GLES2/gl2.h b/opengl/include/GLES2/gl2.h
index f64ec00..8819e30 100644
--- a/opengl/include/GLES2/gl2.h
+++ b/opengl/include/GLES2/gl2.h
@@ -6,7 +6,7 @@
#endif
/*
-** Copyright (c) 2013-2015 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 @@
** 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: 32120 $ on $Date: 2015-10-15 04:27:13 -0700 (Thu, 15 Oct 2015) $
+** https://github.com/KhronosGroup/OpenGL-Registry
*/
#include <GLES2/gl2platform.h>
@@ -42,11 +40,11 @@
#define GL_APIENTRYP GL_APIENTRY*
#endif
-#if !defined(GL_GLES_PROTOTYPES)
+#ifndef GL_GLES_PROTOTYPES
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20151015 */
+/* Generated on date 20170613 */
/* Generated C header for:
* API: gles2