Revert "Update to the latest versions of the GL and EGL headers."

BUILD.gn

@@ -84,9 +84,8 @@ source_set("includes") {
     "include/GLES2/gl2ext.h",
     "include/GLES2/gl2platform.h",
     "include/GLES3/gl3.h",
+    "include/GLES3/gl3ext.h",
     "include/GLES3/gl3platform.h",
-    "include/GLES3/gl31.h",
-    "include/GLES3/gl32.h",
     "include/GLSLANG/ShaderLang.h",
     "include/KHR/khrplatform.h",
   ]

include/EGL/egl.h

@@ -6,7 +6,7 @@ extern "C" {
 #endif
 
 /*
-** Copyright (c) 2013-2015 The Khronos Group Inc.
+** Copyright (c) 2013-2014 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
@@ -33,12 +33,12 @@ extern "C" {
 ** used to make the header, and the header can be found at
 **   http://www.opengl.org/registry/
 **
-** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $
+** Khronos $Revision: 29318 $ on $Date: 2015-01-02 03:16:10 -0800 (Fri, 02 Jan 2015) $
 */
 
 #include <EGL/eglplatform.h>
 
-/* Generated on date 20150623 */
+/* Generated on date 20150102 */
 
 /* Generated C header for:
  * API: egl

include/EGL/eglplatform.h

@@ -25,7 +25,7 @@
 */
 
 /* Platform-specific types and definitions for egl.h
- * $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $
+ * $Revision: 23432 $ on $Date: 2013-10-09 00:57:24 -0700 (Wed, 09 Oct 2013) $
  *
  * 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

include/GLES2/gl2platform.h

 #ifndef __gl2platform_h_
 #define __gl2platform_h_
 
-/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */
+/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version

include/GLES3/gl3ext.h

+#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_ */
+

include/GLES3/gl3platform.h

 #ifndef __gl3platform_h_
 #define __gl3platform_h_
 
-/* $Revision: 23328 $ on $Date:: 2013-10-02 02:28:28 -0700 #$ */
+/* $Revision: 18437 $ on $Date:: 2012-07-08 23:31:39 -0700 #$ */
 
 /*
  * This document is licensed under the SGI Free Software B License Version

include/angle_gl.h

@@ -13,8 +13,7 @@
 #include "GLES2/gl2.h"
 #include "GLES2/gl2ext.h"
 #include "GLES3/gl3.h"
-#include "GLES3/gl31.h"
-#include "GLES3/gl32.h"
+#include "GLES3/gl3ext.h"
 
 // The following enum is used in ANGLE, but is from desktop GL
 #ifndef GL_SAMPLER_2D_RECT_ARB

samples/samples.gyp

@@ -47,11 +47,6 @@
                 'sample_util/tga_utils.cpp',
                 'sample_util/tga_utils.h',
             ],
-            'defines':
-            [
-                'GL_GLEXT_PROTOTYPES',
-                'EGL_EGLEXT_PROTOTYPES',
-            ],
             'msvs_disabled_warnings': [ 4201 ],
             'direct_dependent_settings':
             {
@@ -60,11 +55,6 @@
                 [
                     'sample_util',
                 ],
-                'defines':
-                [
-                    'GL_GLEXT_PROTOTYPES',
-                    'EGL_EGLEXT_PROTOTYPES',
-                ],
             },
         },
         {

src/compiler.gypi

@@ -15,9 +15,8 @@
             '../include/GLES2/gl2ext.h',
             '../include/GLES2/gl2platform.h',
             '../include/GLES3/gl3.h',
+            '../include/GLES3/gl3ext.h',
             '../include/GLES3/gl3platform.h',
-            '../include/GLES3/gl31.h',
-            '../include/GLES3/gl32.h',
             '../include/GLSLANG/ShaderLang.h',
             '../include/GLSLANG/ShaderVars.h',
             '../include/KHR/khrplatform.h',

src/libANGLE/renderer/gl/functionsgl_enums.h

@@ -524,7 +524,7 @@
 #define GL_DEPTH_STENCIL 0x84F9
 #define GL_DEPTH_STENCIL_ATTACHMENT 0x821A
 #define GL_DRAW_FRAMEBUFFER 0x8CA9
-#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING
 #define GL_FIXED_ONLY 0x891D
 #define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
 #define GL_FRAMEBUFFER 0x8D40
@@ -975,8 +975,8 @@
 #define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
 #define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
 #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
-#define GL_COPY_READ_BUFFER_BINDING 0x8F36
-#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37
+#define GL_COPY_READ_BUFFER_BINDING GL_COPY_READ_BUFFER
+#define GL_COPY_WRITE_BUFFER_BINDING GL_COPY_WRITE_BUFFER
 #define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002
 #define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400
 #define GL_IMAGE_1D 0x904C

src/libGLESv2.gypi

@@ -40,9 +40,8 @@
             '../include/GLES2/gl2ext.h',
             '../include/GLES2/gl2platform.h',
             '../include/GLES3/gl3.h',
+            '../include/GLES3/gl3ext.h',
             '../include/GLES3/gl3platform.h',
-            '../include/GLES3/gl31.h',
-            '../include/GLES3/gl32.h',
             '../include/GLSLANG/ShaderLang.h',
             '../include/GLSLANG/ShaderVars.h',
             '../include/KHR/khrplatform.h',
@@ -485,6 +484,8 @@
             'libGLESv2/entry_points_gles_2_0_ext.h',
             'libGLESv2/entry_points_gles_3_0.cpp',
             'libGLESv2/entry_points_gles_3_0.h',
+            'libGLESv2/entry_points_gles_3_0_ext.cpp',
+            'libGLESv2/entry_points_gles_3_0_ext.h',
             'libGLESv2/global_state.cpp',
             'libGLESv2/global_state.h',
             'libGLESv2/libGLESv2.cpp',
@@ -538,7 +539,7 @@
                 ],
                 'defines':
                 [
-                    'GL_GLEXT_PROTOTYPES',
+                    'GL_GLEXT_PROTOTYPES=',
                     'ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" }',
                 ],
                 'conditions':

src/libGLESv2/entry_points_egl.cpp

@@ -11,6 +11,7 @@
 #include "libGLESv2/entry_points_gles_2_0.h"
 #include "libGLESv2/entry_points_gles_2_0_ext.h"
 #include "libGLESv2/entry_points_gles_3_0.h"
+#include "libGLESv2/entry_points_gles_3_0_ext.h"
 #include "libGLESv2/global_state.h"
 
 #include "libANGLE/Context.h"

src/libGLESv2/entry_points_gles_3_0_ext.cpp

+//
+// Copyright(c) 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// entry_points_gles_3_0_ext.cpp : Implements the GLES 3.0 extension entry points.
+
+#include "libGLESv2/entry_points_gles_3_0_ext.h"
+#include "libGLESv2/global_state.h"
+
+namespace gl
+{
+}

src/libGLESv2/entry_points_gles_3_0_ext.h

+//
+// Copyright(c) 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// entry_points_gles_3_0_ext.h : Defines the GLES 3.0 extension entry points.
+
+#ifndef LIBGLESV2_ENTRYPOINTGLES30EXT_H_
+#define LIBGLESV2_ENTRYPOINTGLES30EXT_H_
+
+#include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
+#include <export.h>
+
+namespace gl
+{
+
+// No GLES 3.0 extensions yet
+
+}
+
+#endif // LIBGLESV2_ENTRYPOINTGLES30EXT_H_

src/libGLESv2/libGLESv2.cpp

@@ -9,6 +9,7 @@
 #include "libGLESv2/entry_points_gles_2_0.h"
 #include "libGLESv2/entry_points_gles_2_0_ext.h"
 #include "libGLESv2/entry_points_gles_3_0.h"
+#include "libGLESv2/entry_points_gles_3_0_ext.h"
 
 #include "common/event_tracer.h"
 

src/tests/egl_tests/EGLThreadTest.cpp

 #include "gtest/gtest.h"
 
+#define GL_GLEXT_PROTOTYPES
+
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 

src/tests/test_utils/ANGLETest.h

@@ -7,6 +7,9 @@
 #ifndef ANGLE_TESTS_ANGLE_TEST_H_
 #define ANGLE_TESTS_ANGLE_TEST_H_
 
+#define GL_GLEXT_PROTOTYPES
+#define EGL_EGLEXT_PROTOTYPES
+
 #include <gtest/gtest.h>
 #include <algorithm>
 

util/EGLWindow.h

@@ -12,6 +12,11 @@
 #include <stdint.h>
 #include <string>
 
+#define GL_GLEXT_PROTOTYPES
+#define EGL_EGLEXT_PROTOTYPES
+
+#include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES3/gl3.h>

util/shader_utils.h

@@ -7,7 +7,10 @@
 #ifndef SAMPLE_UTIL_SHADER_UTILS_H
 #define SAMPLE_UTIL_SHADER_UTILS_H
 
+#define GL_GLEXT_PROTOTYPES
+
 #include <GLES3/gl3.h>
+#include <GLES3/gl3ext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <EGL/egl.h>

util/util.gyp

@@ -84,11 +84,6 @@
             [
                 '<@(util_sources)',
             ],
-            'defines':
-            [
-                'GL_GLEXT_PROTOTYPES',
-                'EGL_EGLEXT_PROTOTYPES',
-            ],
             'direct_dependent_settings':
             {
                 'include_dirs':
@@ -96,11 +91,6 @@
                     '<(angle_path)/include',
                     '<(angle_path)/util',
                 ],
-                'defines':
-                [
-                    'GL_GLEXT_PROTOTYPES',
-                    'EGL_EGLEXT_PROTOTYPES',
-                ],
             },
             'conditions':
             [