Update Chromium code for Pixel Local Storage extension updates.

Apply enum renumbering and regenerate GL bindings. Update WebGL2
extension IDL. Reenable PLS unit test in gl_tests.

Bug: angleproject:40096838
Change-Id: I27de7441952fafce823d30b97ce790be3a4fa21c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6380793
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1436433}

gpu/GLES2/gl2extchromium.h

@@ -282,60 +282,56 @@ typedef void(GL_APIENTRYP PFNGLPROVOKINGVERTEXANGLEPROC)(GLenum provokeMode);
 #define GL_MAX_PIXEL_LOCAL_STORAGE_PLANES_ANGLE 0x96E0
 #endif
 
-#ifndef GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE
-#define GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE 0x96E1
-#endif
-
 #ifndef GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE
-#define GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE 0x96E2
+#define GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE 0x96E1
 #endif
 
 #ifndef GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE
-#define GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE 0x96E3
+#define GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE 0x96E2
 #endif
 
 #ifndef GL_LOAD_OP_ZERO_ANGLE
-#define GL_LOAD_OP_ZERO_ANGLE 0x96E4
+#define GL_LOAD_OP_ZERO_ANGLE 0x96E3
 #endif
 
 #ifndef GL_LOAD_OP_CLEAR_ANGLE
-#define GL_LOAD_OP_CLEAR_ANGLE 0x96E5
+#define GL_LOAD_OP_CLEAR_ANGLE 0x96E4
 #endif
 
 #ifndef GL_LOAD_OP_LOAD_ANGLE
-#define GL_LOAD_OP_LOAD_ANGLE 0x96E6
+#define GL_LOAD_OP_LOAD_ANGLE 0x96E5
 #endif
 
 #ifndef GL_STORE_OP_STORE_ANGLE
-#define GL_STORE_OP_STORE_ANGLE 0x96E7
+#define GL_STORE_OP_STORE_ANGLE 0x96E6
 #endif
 
 #ifndef GL_PIXEL_LOCAL_FORMAT_ANGLE
-#define GL_PIXEL_LOCAL_FORMAT_ANGLE 0x96E8
+#define GL_PIXEL_LOCAL_FORMAT_ANGLE 0x96E7
 #endif
 
 #ifndef GL_PIXEL_LOCAL_TEXTURE_NAME_ANGLE
-#define GL_PIXEL_LOCAL_TEXTURE_NAME_ANGLE 0x96E9
+#define GL_PIXEL_LOCAL_TEXTURE_NAME_ANGLE 0x96E8
 #endif
 
 #ifndef GL_PIXEL_LOCAL_TEXTURE_LEVEL_ANGLE
-#define GL_PIXEL_LOCAL_TEXTURE_LEVEL_ANGLE 0x96EA
+#define GL_PIXEL_LOCAL_TEXTURE_LEVEL_ANGLE 0x96E9
 #endif
 
 #ifndef GL_PIXEL_LOCAL_TEXTURE_LAYER_ANGLE
-#define GL_PIXEL_LOCAL_TEXTURE_LAYER_ANGLE 0x96EB
+#define GL_PIXEL_LOCAL_TEXTURE_LAYER_ANGLE 0x96EA
 #endif
 
 #ifndef GL_PIXEL_LOCAL_CLEAR_VALUE_FLOAT_ANGLE
-#define GL_PIXEL_LOCAL_CLEAR_VALUE_FLOAT_ANGLE 0x96EC
+#define GL_PIXEL_LOCAL_CLEAR_VALUE_FLOAT_ANGLE 0x96EB
 #endif
 
 #ifndef GL_PIXEL_LOCAL_CLEAR_VALUE_INT_ANGLE
-#define GL_PIXEL_LOCAL_CLEAR_VALUE_INT_ANGLE 0x96ED
+#define GL_PIXEL_LOCAL_CLEAR_VALUE_INT_ANGLE 0x96EC
 #endif
 
 #ifndef GL_PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_ANGLE
-#define GL_PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_ANGLE 0x96EE
+#define GL_PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_ANGLE 0x96ED
 #endif
 
 #ifdef GL_GLEXT_PROTOTYPES

gpu/command_buffer/tests/gl_angle_shader_pixel_local_storage_unittest.cc

@@ -20,10 +20,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_implementation.h"
 
-// Temporarily disable this test while enums are being renumbered.
-// anglebug.com/40096838
-#if 0
-
 namespace gpu {
 class ANGLEShaderPixelLocalStorageTest : public testing::Test {
  public:
@@ -65,9 +61,6 @@ TEST_F(ANGLEShaderPixelLocalStorageTest, GetIntegerv) {
   }
 
   EXPECT_GT(gl_get_integer(GL_MAX_PIXEL_LOCAL_STORAGE_PLANES_ANGLE), 4);
-  EXPECT_GT(gl_get_integer(
-                GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE),
-            0);
   EXPECT_GT(
       gl_get_integer(
           GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE),
@@ -117,8 +110,10 @@ TEST_F(ANGLEShaderPixelLocalStorageTest, GetIntegerv) {
 // Verifies that glGetFramebufferPixelLocalStorageParameter{f,i}vANGLE is
 // marshalled properly over the command buffer. Thorough testing of these
 // commands is done in angle_end2end_tests.
+
+// TODO(anglebug.com/40096838): debug and re-enable this test.
 TEST_F(ANGLEShaderPixelLocalStorageTest,
-       GetFramebufferPixelLocalStorageParameter) {
+       DISABLED_GetFramebufferPixelLocalStorageParameter) {
   if (!gl_.IsInitialized() ||
       !GLTestHelper::HasExtension("GL_ANGLE_shader_pixel_local_storage")) {
     return;
@@ -363,5 +358,3 @@ TEST_F(ANGLEShaderPixelLocalStorageTest, BlockEmulatedDefaultFramebuffer) {
   EXPECT_GL_ERROR(GL_NO_ERROR);
 }
 }  // namespace gpu
-
-#endif  // #if 0

third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc

@@ -4993,7 +4993,6 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state,
                         "OES_shader_multisample_interpolation not enabled");
       return ScriptValue::CreateNull(script_state->GetIsolate());
     case GL_MAX_PIXEL_LOCAL_STORAGE_PLANES_ANGLE:
-    case GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE:
     case GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE:
     case GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE:
       if (ExtensionEnabled(kWebGLShaderPixelLocalStorageName)) {

third_party/blink/renderer/modules/webgl/webgl_shader_pixel_local_storage.idl

@@ -8,20 +8,19 @@
     LegacyNoInterfaceObject
 ] interface WebGLShaderPixelLocalStorage {
     const unsigned long MAX_PIXEL_LOCAL_STORAGE_PLANES_WEBGL = 0x96E0;
-    const unsigned long MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_WEBGL = 0x96E1;
-    const unsigned long MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_WEBGL = 0x96E2;
-    const unsigned long PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_WEBGL = 0x96E3;
-    const unsigned long LOAD_OP_ZERO_WEBGL = 0x96E4;
-    const unsigned long LOAD_OP_CLEAR_WEBGL = 0x96E5;
-    const unsigned long LOAD_OP_LOAD_WEBGL = 0x96E6;
-    const unsigned long STORE_OP_STORE_WEBGL = 0x96E7;
-    const unsigned long PIXEL_LOCAL_FORMAT_WEBGL = 0x96E8;
-    const unsigned long PIXEL_LOCAL_TEXTURE_NAME_WEBGL = 0x96E9;
-    const unsigned long PIXEL_LOCAL_TEXTURE_LEVEL_WEBGL = 0x96EA;
-    const unsigned long PIXEL_LOCAL_TEXTURE_LAYER_WEBGL = 0x96EB;
-    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_FLOAT_WEBGL = 0x96EC;
-    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_INT_WEBGL = 0x96ED;
-    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_WEBGL = 0x96EE;
+    const unsigned long MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_WEBGL = 0x96E1;
+    const unsigned long PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_WEBGL = 0x96E2;
+    const unsigned long LOAD_OP_ZERO_WEBGL = 0x96E3;
+    const unsigned long LOAD_OP_CLEAR_WEBGL = 0x96E4;
+    const unsigned long LOAD_OP_LOAD_WEBGL = 0x96E5;
+    const unsigned long STORE_OP_STORE_WEBGL = 0x96E6;
+    const unsigned long PIXEL_LOCAL_FORMAT_WEBGL = 0x96E7;
+    const unsigned long PIXEL_LOCAL_TEXTURE_NAME_WEBGL = 0x96E8;
+    const unsigned long PIXEL_LOCAL_TEXTURE_LEVEL_WEBGL = 0x96E9;
+    const unsigned long PIXEL_LOCAL_TEXTURE_LAYER_WEBGL = 0x96EA;
+    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_FLOAT_WEBGL = 0x96EB;
+    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_INT_WEBGL = 0x96EC;
+    const unsigned long PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_WEBGL = 0x96ED;
     boolean isCoherent();
     undefined framebufferTexturePixelLocalStorageWEBGL(GLint plane,
                                                        WebGLTexture? texture,

ui/gl/egl_bindings_autogen_mock.cc

@@ -1,12 +1,6 @@
 // Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
-#ifdef UNSAFE_BUFFERS_BUILD
-// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
-#pragma allow_unsafe_libc_calls
-#endif
-
 //
 // This file is auto-generated from
 // ui/gl/generate_bindings.py

ui/gl/gl_bindings_autogen_mock.cc

@@ -1,12 +1,6 @@
 // Copyright 2016 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-
-#ifdef UNSAFE_BUFFERS_BUILD
-// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
-#pragma allow_unsafe_libc_calls
-#endif
-
 //
 // This file is auto-generated from
 // ui/gl/generate_bindings.py

ui/gl/gl_enums_implementation_autogen.h

@@ -6882,58 +6882,54 @@ static constexpr EnumToString kEnumToStringTable[] = {
     },
     {
         0x96E1,
-        "GL_MAX_COLOR_ATTACHMENTS_WITH_ACTIVE_PIXEL_LOCAL_STORAGE_ANGLE",
-    },
-    {
-        0x96E2,
         "GL_MAX_COMBINED_DRAW_BUFFERS_AND_PIXEL_LOCAL_STORAGE_PLANES_ANGLE",
     },
     {
-        0x96E3,
+        0x96E2,
         "GL_PIXEL_LOCAL_STORAGE_ACTIVE_PLANES_ANGLE",
     },
     {
-        0x96E4,
+        0x96E3,
         "GL_LOAD_OP_ZERO_ANGLE",
     },
     {
-        0x96E5,
+        0x96E4,
         "GL_LOAD_OP_CLEAR_ANGLE",
     },
     {
-        0x96E6,
+        0x96E5,
         "GL_LOAD_OP_LOAD_ANGLE",
     },
     {
-        0x96E7,
+        0x96E6,
         "GL_STORE_OP_STORE_ANGLE",
     },
     {
-        0x96E8,
+        0x96E7,
         "GL_PIXEL_LOCAL_FORMAT_ANGLE",
     },
     {
-        0x96E9,
+        0x96E8,
         "GL_PIXEL_LOCAL_TEXTURE_NAME_ANGLE",
     },
     {
-        0x96EA,
+        0x96E9,
         "GL_PIXEL_LOCAL_TEXTURE_LEVEL_ANGLE",
     },
     {
-        0x96EB,
+        0x96EA,
         "GL_PIXEL_LOCAL_TEXTURE_LAYER_ANGLE",
     },
     {
-        0x96EC,
+        0x96EB,
         "GL_PIXEL_LOCAL_CLEAR_VALUE_FLOAT_ANGLE",
     },
     {
-        0x96ED,
+        0x96EC,
         "GL_PIXEL_LOCAL_CLEAR_VALUE_INT_ANGLE",
     },
     {
-        0x96EE,
+        0x96ED,
         "GL_PIXEL_LOCAL_CLEAR_VALUE_UNSIGNED_INT_ANGLE",
     },
     {