Skip to content

Commit

Permalink
Update ANGLE from Chromium 114.0.5735.358
Browse files Browse the repository at this point in the history
Issue: 323209852
Reviewed-on: youtube#3691
  • Loading branch information
dahlstrom-g authored Jul 18, 2024
2 parents 0f5cd1b + dd8d431 commit a344283
Show file tree
Hide file tree
Showing 3,299 changed files with 982,758 additions and 394,737 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions starboard/egl_and_gles/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ config("egl_and_gles_angle_config") {
if (gl_type == "angle") {
group("egl_and_gles_angle") {
public_deps = [
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/angle:libEGL_static",
"//third_party/angle:libGLESv2_static",
]
public_configs = [ ":egl_and_gles_angle_config" ]
}
Expand Down
15 changes: 7 additions & 8 deletions third_party/angle/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ ColumnLimit: 100
# Always break before braces
BreakBeforeBraces: Custom
BraceWrapping:
# TODO(lujc) wait for clang-format-9 support in Chromium tools
# AfterCaseLabel: true
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
Expand All @@ -27,12 +26,12 @@ BraceWrapping:
BeforeCatch: true
BeforeElse: true
IndentBraces: false
# SplitEmptyFunction: false
# SplitEmptyRecord: false
# SplitEmptyNamespace: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false

# Keeps extern "C" blocks unindented.
# AfterExternBlock: false
AfterExternBlock: false

# Indent case labels.
IndentCaseLabels: true
Expand All @@ -54,7 +53,7 @@ AllowShortCaseLabelsOnASingleLine: false
KeepEmptyLinesAtTheStartOfBlocks: true

# Indent nested PP directives.
#IndentPPDirectives: AfterHash
IndentPPDirectives: AfterHash

# Include blocks style
#IncludeBlocks: Preserve
IncludeBlocks: Preserve
3 changes: 3 additions & 0 deletions third_party/angle/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
*.sh eol=lf
*.gn eol=lf
*.gni eol=lf
*.star eol=lf
infra/config/generated/*.cfg eol=lf
infra/config/generated/*.pyl eol=lf
src/compiler/preprocessor/preprocessor_*.* eol=lf
src/compiler/translator/glslang_*.* eol=lf

Expand Down
67 changes: 53 additions & 14 deletions third_party/angle/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.DS_Store
.vs
.vscode
*.Makefile
*.ncb
*.nvuser
Expand All @@ -20,41 +22,67 @@
*.vcxproj.user
*.vsp
*~
.DS_Store
.*.sw*
.sw*
.cipd
.gclient
.gclient_entries
.gclient*
.git_cl_description_backup
/src/tests/third_party/gles_conformance_tests
/testing
/third_party/abseil-cpp
/third_party/android_build_tools
/third_party/android_deps
/third_party/android_ndk
/third_party/android_platform
/third_party/android_sdk
/third_party/android_system_sdk/*.jar
/third_party/astc-encoder/src
/third_party/bazel/desugar/*.jar
/third_party/catapult
/third_party/cherry
/third_party/colorama/src
/third_party/depot_tools
/third_party/EGL-Registry/src
/third_party/flatbuffers/src
/third_party/fuchsia-sdk
/third_party/gles1_conform
/third_party/glmark2/src
/third_party/glslang/src
/third_party/googletest
/third_party/ijar
/third_party/jdk/current
/third_party/jdk/extras/java_8
/third_party/jinja2
/third_party/jsoncpp
/third_party/kotlin_stdlib
/third_party/libdrm
/third_party/libjpeg_turbo
/third_party/libpng/src
/third_party/llvm-build
/third_party/markupsafe
/third_party/meson
/third_party/nasm
/third_party/ninja
/third_party/OpenCL-Docs/src
/third_party/OpenCL-ICD-Loader/src
/third_party/OpenGL-Registry/src
/third_party/proguard/lib
/third_party/protobuf
/third_party/Python-Markdown
/third_party/qemu-linux-x64
/third_party/qemu-mac-x64
/third_party/r8/d8
/third_party/r8/lib
/third_party/rapidjson/src
/third_party/spirv-cross/src
/third_party/spirv-headers/src
/third_party/spirv-tools/src
/third_party/requests/src
/third_party/six
/third_party/SwiftShader
/third_party/turbine/*.jar
/third_party/VK-GL-CTS/src
/third_party/vulkan-headers/src
/third_party/vulkan-loader/src
/third_party/vulkan-tools/src
/third_party/vulkan-validation-layers/src
/third_party/yasm
/third_party/vulkan-deps
/third_party/vulkan_memory_allocator
/third_party/wayland
/third_party/zlib
/tools/android/errorprone_plugin
/tools/clang
/tools/flex-bison/linux/bison
/tools/flex-bison/linux/flex
Expand All @@ -64,11 +92,19 @@
/tools/flex-bison/windows/msys*.dll
/tools/glslang/glslang_validator
/tools/glslang/glslang_validator.exe
/tools/luci-go
/tools/mb
/tools/md_browser
/tools/memory
/tools/perf
/tools/protoc_wrapper
/tools/python
/tools/skia_goldctl
/tools/valgrind
angle.iml
angle_debug.txt
build
buildtools/
/build
/buildtools
debug.txt
Debug/
Debug_ARM/
Expand All @@ -85,3 +121,6 @@ Release_Win32/
Release_x64/
TestResults.qpa
.idea/

# Any temporary files will confuse code generation.
!scripts/code_generation_hashes/*
20 changes: 18 additions & 2 deletions third_party/angle/.gn
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ import("//dotfile_settings.gni")
# Location of the build configuration file.
buildconfig = "//build/config/BUILDCONFIG.gn"

# The python interpreter to use by default. On Windows, this will look
# for python3.exe and python3.bat.
script_executable = "python3"

# These are the targets to check headers for by default. The files in targets
# matching these patterns (see "gn help label_pattern" for format) will have
# their includes checked for proper dependencies when you run either
# "gn check" or "gn gen --check".
check_targets = [ "*" ]

# These are the list of GN files that run exec_script. This whitelist exists
# These are the list of GN files that run exec_script. This allowlist exists
# to force additional review for new uses of exec_script, which is strongly
# discouraged except for gypi_to_gn calls.
exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
Expand All @@ -33,8 +37,20 @@ exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
]

default_args = {
use_custom_libcxx = false
clang_use_chrome_plugins = true
build_angle_deqp_tests = true
use_sysroot = true

# Saves on importing extra dependencies and ANGLE doesn't use JS.
enable_js_protobuf = false

# Saves on importing extra dependencies and ANGLE doesn't use Rust.
enable_rust = false

# Disable location tags in isolates.
tests_have_location_tags = false

# Use base level API level 29 support for AHardwareBuffer ANGLE tests.
android32_ndk_api_level = 29
android64_ndk_api_level = 29
}
2 changes: 1 addition & 1 deletion third_party/angle/.style.yapf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[style]
based_on_style = chromium
based_on_style = yapf
column_limit = 99
indent_width = 4
Loading

0 comments on commit a344283

Please sign in to comment.