Remove glext_angle.h, merge contents into gl2ext_angle.h

Currently glext_angle.h file, which is for GLES 1.x, has enums for
GL_ANGLE_yuv_internal_format which is an ES 3.0+ extension.
Merge contents of glext_angle.h into gl2ext_angle.h and remove
glext_angle.h

Bug: angleproject:6579
Change-Id: Iec5427af131888a2d9c473f4f497afb71dcafdac
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3232822
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

include/GLES/glext.h

@@ -955,9 +955,6 @@ GL_API void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
 #define GL_WRITEONLY_RENDERING_QCOM       0x8823
 #endif /* GL_QCOM_writeonly_rendering */
 
-/* ANGLE GLES1 extensions */
-#include "glext_angle.h"
-
 #ifdef __cplusplus
 }
 #endif

include/GLES/glext_angle.h

@@ -1,39 +0,0 @@
-//
-// Copyright 2018 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.
-//
-// glext_angle.h: ANGLE modifications to the glext.h header file.
-//   Currently we don't include this file directly, we patch glext.h
-//   to include it implicitly so it is visible throughout our code.
-
-#ifndef INCLUDE_GLES_GLEXT_ANGLE_H_
-#define INCLUDE_GLES_GLEXT_ANGLE_H_
-
-// clang-format off
-
-// clang-format on
-
-#ifndef GL_ANGLE_yuv_internal_format
-#define GL_ANGLE_yuv_internal_format
-
-// YUV formats introduced by GL_ANGLE_yuv_internal_format
-// 8-bit YUV formats
-#define GL_G8_B8R8_2PLANE_420_UNORM_ANGLE 0x96B1
-#define GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE 0x96B2
-
-// 10-bit YUV formats
-#define GL_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_ANGLE 0x96B3
-#define GL_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_ANGLE 0x96B4
-
-// 12-bit YUV formats
-#define GL_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_ANGLE 0x96B5
-#define GL_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_ANGLE 0x96B6
-
-// 16-bit YUV formats
-#define GL_G16_B16R16_2PLANE_420_UNORM_ANGLE 0x96B7
-#define GL_G16_B16_R16_3PLANE_420_UNORM_ANGLE 0x96B8
-
-#endif /* GL_ANGLE_yuv_internal_format */
-
-#endif  // INCLUDE_GLES_GLEXT_ANGLE_H_

include/GLES2/gl2ext_angle.h

@@ -569,4 +569,26 @@ GL_APICALL void GL_APIENTRY glImportSemaphoreZirconHandleANGLE(GLuint memory,
 
 // clang-format on
 
+#ifndef GL_ANGLE_yuv_internal_format
+#define GL_ANGLE_yuv_internal_format
+
+// YUV formats introduced by GL_ANGLE_yuv_internal_format
+// 8-bit YUV formats
+#define GL_G8_B8R8_2PLANE_420_UNORM_ANGLE 0x96B1
+#define GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE 0x96B2
+
+// 10-bit YUV formats
+#define GL_G10X6_B10X6R10X6_2PLANE_420_UNORM_3PACK16_ANGLE 0x96B3
+#define GL_G10X6_B10X6_R10X6_3PLANE_420_UNORM_3PACK16_ANGLE 0x96B4
+
+// 12-bit YUV formats
+#define GL_G12X4_B12X4R12X4_2PLANE_420_UNORM_3PACK16_ANGLE 0x96B5
+#define GL_G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16_ANGLE 0x96B6
+
+// 16-bit YUV formats
+#define GL_G16_B16R16_2PLANE_420_UNORM_ANGLE 0x96B7
+#define GL_G16_B16_R16_3PLANE_420_UNORM_ANGLE 0x96B8
+
+#endif /* GL_ANGLE_yuv_internal_format */
+
 #endif  // INCLUDE_GLES2_GL2EXT_ANGLE_H_

src/libGLESv2.gni

@@ -176,7 +176,6 @@ libangle_includes = [
   "include/GLES/gl.h",
   "include/GLES/glplatform.h",
   "include/GLES/glext.h",
-  "include/GLES/glext_angle.h",
   "include/GLES2/gl2.h",
   "include/GLES2/gl2ext.h",
   "include/GLES2/gl2ext_angle.h",