Clean up third_party/angle (#1223)

b/144796353
youtube · Aug 13, 2023 · 3b187d1 · 3b187d1
2 parents 11fbc80 + 842ff0d
commit 3b187d1
Show file tree

Hide file tree

Showing 22 changed files with 139 additions and 118 deletions.
diff --git a/third_party/angle/BUILD.gn b/third_party/angle/BUILD.gn
@@ -104,11 +104,11 @@ config("internal_config") {
   defines = []
 
   if (!is_starboard) {
-    if (angle_64bit_current_cpu) {
-      defines += [ "ANGLE_IS_64_BIT_CPU" ]
-    } else {
-      defines += [ "ANGLE_IS_32_BIT_CPU" ]
-    }
+  if (angle_64bit_current_cpu) {
+    defines += [ "ANGLE_IS_64_BIT_CPU" ]
+  } else {
+    defines += [ "ANGLE_IS_32_BIT_CPU" ]
+  }
   }
 
   if (angle_enable_trace) {
@@ -1173,108 +1173,108 @@ foreach(is_shared_library,
       ]
     }
   } else {
-    target(library_type, library_name) {
-      sources = util_sources
-      deps = [
-        ":angle_common",
-        ":angle_util_loader_headers",
+  target(library_type, library_name) {
+    sources = util_sources
+    deps = [
+      ":angle_common",
+      ":angle_util_loader_headers",
+    ]
+    public_deps = []
+    libs = []
+
+    if (is_win && !angle_is_winuwp) {
+      sources += util_win_sources
+      deps += [ ":angle_stack_walker" ]
+    }
+
+    if (is_linux) {
+      sources += util_linux_sources
+      libs += [
+        "rt",
+        "dl",
       ]
-      public_deps = []
-      libs = []
+    }
 
-      if (is_win && !angle_is_winuwp) {
-        sources += util_win_sources
-        deps += [ ":angle_stack_walker" ]
-      }
+    if (is_mac) {
+      sources += util_osx_sources
+      libs += [
+        "AppKit.framework",
+        "QuartzCore.framework",
+      ]
+    }
 
-      if (is_linux) {
-        sources += util_linux_sources
-        libs += [
-          "rt",
-          "dl",
-        ]
-      }
+    if (angle_use_x11) {
+      sources += util_x11_sources
+    }
 
-      if (is_mac) {
-        sources += util_osx_sources
-        libs += [
-          "AppKit.framework",
-          "QuartzCore.framework",
-        ]
-      }
+    if (is_android) {
+      sources += util_android_sources
+      libs += [
+        "android",
+        "log",
+      ]
+    }
 
-      if (angle_use_x11) {
-        sources += util_x11_sources
-      }
+    configs += [ ":debug_annotations_config" ]
+
+    public_configs += [ ":angle_util_config" ]
+
+    if (is_fuchsia) {
+      sources += util_fuchsia_sources
+      public_deps += [
+        "src/common/fuchsia_egl",
+        "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
+        "//third_party/fuchsia-sdk/sdk:async_loop_default",
+        "//third_party/fuchsia-sdk/sdk:fdio",
+        "//third_party/fuchsia-sdk/sdk:images",
+        "//third_party/fuchsia-sdk/sdk:scenic_cpp",
+        "//third_party/fuchsia-sdk/sdk:ui_policy",
+        "//third_party/fuchsia-sdk/sdk:ui_scenic",
+        "//third_party/fuchsia-sdk/sdk:ui_views",
+      ]
+    } else if (use_ozone) {
+      sources += util_ozone_sources
+    }
 
-      if (is_android) {
-        sources += util_android_sources
-        libs += [
-          "android",
-          "log",
-        ]
-      }
+    if (is_shared_library) {
+      defines = [ "LIBANGLE_UTIL_IMPLEMENTATION" ]
 
-      configs += [ ":debug_annotations_config" ]
-
-      public_configs += [ ":angle_util_config" ]
-
-      if (is_fuchsia) {
-        sources += util_fuchsia_sources
-        public_deps += [
-          "src/common/fuchsia_egl",
-          "//third_party/fuchsia-sdk/sdk:async_loop_cpp",
-          "//third_party/fuchsia-sdk/sdk:async_loop_default",
-          "//third_party/fuchsia-sdk/sdk:fdio",
-          "//third_party/fuchsia-sdk/sdk:images",
-          "//third_party/fuchsia-sdk/sdk:scenic_cpp",
-          "//third_party/fuchsia-sdk/sdk:ui_policy",
-          "//third_party/fuchsia-sdk/sdk:ui_scenic",
-          "//third_party/fuchsia-sdk/sdk:ui_views",
-        ]
-      } else if (use_ozone) {
-        sources += util_ozone_sources
+      if (is_win && !angle_is_winuwp) {
+        sources += util_win_shared_sources
       }
 
-      if (is_shared_library) {
-        defines = [ "LIBANGLE_UTIL_IMPLEMENTATION" ]
-
-        if (is_win && !angle_is_winuwp) {
-          sources += util_win_shared_sources
-        }
-
-        public_deps += [ ":angle_util_loader" ]
-
-        if (is_mac && !is_component_build) {
-          ldflags = [
-            "-install_name",
-            "@rpath/libangle_util.dylib",
-          ]
-        }
-      } else {
-        public_configs += [
-          ":angle_static",
-          ":gl_prototypes",
+      public_deps += [ ":angle_util_loader" ]
+
+      if (is_mac && !is_component_build) {
+        ldflags = [
+          "-install_name",
+          "@rpath/libangle_util.dylib",
         ]
       }
+    } else {
+      public_configs += [
+        ":angle_static",
+        ":gl_prototypes",
+      ]
     }
   }
+  }
 }
 
 if (!is_starboard) {
-  # Convenience targets for some of the samples so they can be built
-  # with Chromium's toolchain.
-  angle_executable("angle_shader_translator") {
-    testonly = true
+# Convenience targets for some of the samples so they can be built
+# with Chromium's toolchain.
+angle_executable("angle_shader_translator") {
+  testonly = true
 
-    sources = [
-      "samples/shader_translator/shader_translator.cpp",
-    ]
+  sources = [
+    "samples/shader_translator/shader_translator.cpp",
+  ]
 
-    deps = [
-      ":translator",
-    ]
-  }
+  deps = [
+    ":translator",
+  ]
+}
 }
 
 if (angle_has_build && !is_starboard) {

diff --git a/third_party/angle/METADATA b/third_party/angle/METADATA
@@ -7,11 +7,12 @@ third_party {
     type: GIT
     value: "https://chromium.googlesource.com/angle/angle"
   }
-  version: "c1776c61e5c3722cb2de95aac1119289ff822469"
+  version: "362168eb695d0ac0a2bee85dd356232c9c20d0ef"
+  # from https://chromium.googlesource.com/chromium/src/+/80.0.3987.165/DEPS#188
   last_upgrade_date {
-    year: 2019
-    month: 11
-    day: 20
+    year: 2020
+    month: 2
+    day: 18
   }
   license_type: NOTICE
 }
diff --git a/third_party/angle/codereview.settings b/third_party/angle/codereview.settings
@@ -0,0 +1,6 @@
+# This file is used by git cl to get repository specific information.
+CODE_REVIEW_SERVER: https://chromium-review.googlesource.com
+GERRIT_HOST: True
+TRYSERVER_GERRIT_URL: https://chromium-review.googlesource.com
+GERRIT_SQUASH_UPLOADS: False
+FORMAT_FULL_BY_DEFAULT: True
diff --git a/third_party/angle/src/common/utilities.cpp b/third_party/angle/src/common/utilities.cpp
@@ -12,7 +12,6 @@
 #include "common/mathutil.h"
 #include "common/platform.h"
 
-#include <cstdlib>
 #include <set>
 
 #if defined(ANGLE_ENABLE_WINDOWS_UWP)

diff --git a/third_party/angle/src/compiler/translator/FunctionLookup.cpp b/third_party/angle/src/compiler/translator/FunctionLookup.cpp
@@ -8,7 +8,6 @@
 //
 
 #include "compiler/translator/FunctionLookup.h"
-
 #include "compiler/translator/ImmutableStringBuilder.h"
 
 namespace sh

diff --git a/third_party/angle/src/compiler/translator/ImmutableString.h b/third_party/angle/src/compiler/translator/ImmutableString.h
@@ -140,4 +140,4 @@ constexpr ImmutableString kEmptyImmutableString("");
 
 std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str);
 
-#endif  // COMPILER_TRANSLATOR_IMMUTABLESTRING_H_
+#endif  // COMPILER_TRANSLATOR_IMMUTABLESTRING_H_
diff --git a/third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp b/third_party/angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp
@@ -18,7 +18,7 @@ std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str)
 }
 
 #if defined(_MSC_VER)
-#pragma warning(disable : 4309)  // truncation of constant value
+#    pragma warning(disable : 4309)  // truncation of constant value
 #endif
 
 namespace
@@ -200,7 +200,8 @@ int UnmangledPerfectHash(const char *key)
 
     return (UnmangledHashG(key, unmangledkT1) + UnmangledHashG(key, unmangledkT2)) % 287;
 }
-}
+
+}  // namespace
 
 namespace sh
 {

diff --git a/third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp b/third_party/angle/src/compiler/translator/ImmutableString_autogen.cpp
@@ -18,7 +18,7 @@ std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str)
 }
 
 #if defined(_MSC_VER)
-#pragma warning(disable : 4309)  // truncation of constant value
+#    pragma warning(disable : 4309)  // truncation of constant value
 #endif
 
 namespace
@@ -352,7 +352,8 @@ int UnmangledPerfectHash(const char *key)
 
     return (UnmangledHashG(key, unmangledkT1) + UnmangledHashG(key, unmangledkT2)) % 382;
 }
-}
+
+}  // namespace
 
 namespace sh
 {

diff --git a/third_party/angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp b/third_party/angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp
@@ -2,7 +2,7 @@
 // Generated by gen_builtin_symbols.py using data from builtin_variables.json and
 // builtin_function_declarations.txt.
 //
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
+// Copyright 2019 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.
 //

diff --git a/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp b/third_party/angle/src/compiler/translator/SymbolTable_autogen.cpp
@@ -2,7 +2,7 @@
 // Generated by gen_builtin_symbols.py using data from builtin_variables.json and
 // builtin_function_declarations.txt.
 //
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
+// Copyright 2019 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.
 //

diff --git a/third_party/angle/src/compiler/translator/Types.cpp b/third_party/angle/src/compiler/translator/Types.cpp
@@ -19,6 +19,7 @@
 
 namespace sh
 {
+
 const char *getBasicString(TBasicType t)
 {
     switch (t)

diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h
@@ -242,7 +242,6 @@ class TType
         }
         return static_cast<char>('A' + sizeKey - 10);
     }
-
     const char *getMangledName() const;
 
     bool sameNonArrayType(const TType &right) const;

diff --git a/third_party/angle/src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h b/third_party/angle/src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h
@@ -2,7 +2,7 @@
 // Generated by gen_builtin_symbols.py using data from builtin_variables.json and
 // builtin_function_declarations.txt.
 //
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
+// Copyright 2019 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.
 //

diff --git a/third_party/angle/src/compiler/translator/tree_util/BuiltIn_complete_autogen.h b/third_party/angle/src/compiler/translator/tree_util/BuiltIn_complete_autogen.h
@@ -2,7 +2,7 @@
 // Generated by gen_builtin_symbols.py using data from builtin_variables.json and
 // builtin_function_declarations.txt.
 //
-// Copyright 2020 The ANGLE Project Authors. All rights reserved.
+// Copyright 2019 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.
 //

diff --git a/third_party/angle/src/gpu_info_util/SystemInfo_win.cpp b/third_party/angle/src/gpu_info_util/SystemInfo_win.cpp
@@ -8,15 +8,14 @@
 
 #include "gpu_info_util/SystemInfo_internal.h"
 
+#include "common/debug.h"
+#include "common/string_utils.h"
+
 // Windows.h needs to be included first
 #include <windows.h>
 
 #include <dxgi.h>
 
-#include "common/debug.h"
-#include "common/string_utils.h"
-
-
 #include <array>
 #include <sstream>
 

diff --git a/third_party/angle/src/libANGLE/LoggingAnnotator.cpp b/third_party/angle/src/libANGLE/LoggingAnnotator.cpp
@@ -56,7 +56,7 @@ void LoggingAnnotator::logMessage(const gl::LogMessage &msg) const
     }
     else
     {
-        gl::Trace(msg.getSeverity(), msg.getMessage().c_str());
+    gl::Trace(msg.getSeverity(), msg.getMessage().c_str());
     }
 }
 

diff --git a/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.h b/third_party/angle/src/libANGLE/renderer/d3d/SurfaceD3D.h
@@ -118,6 +118,7 @@ class SurfaceD3D : public SurfaceImpl
 
     HANDLE mShareHandle;
     IUnknown *mD3DTexture;
+
     EGLenum mBuftype;
     bool mBindChroma;
 };

diff --git a/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp b/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
@@ -243,13 +243,11 @@ bool CullsEverything(const gl::State &glState)
 // StateManager11::ViewCache Implementation.
 template <typename ViewType, typename DescType>
 StateManager11::ViewCache<ViewType, DescType>::ViewCache() : mHighestUsedView(0)
-{
-}
+{}
 
 template <typename ViewType, typename DescType>
 StateManager11::ViewCache<ViewType, DescType>::~ViewCache()
-{
-}
+{}
 
 template <typename ViewType, typename DescType>
 void StateManager11::ViewCache<ViewType, DescType>::update(size_t resourceIndex, ViewType *view)