Skip to content

Commit 42a20f8

Browse files
jdarpinianjdarpinian
committed
Update ANGLE 2020-11-12
https://bugs.webkit.org/show_bug.cgi?id=218877 Reviewed by Kenneth Russell. Source/ThirdParty/ANGLE: * Excessively large list of upstream changes omitted. LayoutTests: * webgl/2.0.0/conformance2/textures/misc/tex-mipmap-levels-expected.txt: Test fixed. Canonical link: https://commits.webkit.org/231838@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 796913a commit 42a20f8

1,046 files changed

Lines changed: 159144 additions & 78557 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LayoutTests/ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2020-11-20 James Darpinian <jdarpinian@chromium.org>
2+
3+
Update ANGLE 2020-11-12
4+
https://bugs.webkit.org/show_bug.cgi?id=218877
5+
6+
Reviewed by Kenneth Russell.
7+
8+
* webgl/2.0.0/conformance2/textures/misc/tex-mipmap-levels-expected.txt: Test fixed.
9+
110
2020-11-20 Chris Dumez <cdumez@apple.com>
211

312
AudioWorkletProcessor::process() may get called on non-audio worklet thread and crash

‎LayoutTests/webgl/2.0.0/conformance2/textures/misc/tex-mipmap-levels-expected.txt‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,4 @@
11
This test runs the WebGL Test listed below in an iframe and reports PASS or FAIL.
22

33
Test: ../../../resources/webgl_test_files/conformance2/textures/misc/tex-mipmap-levels.html
4-
5-
[ 1: PASS ] getError was expected value: NO_ERROR : Should be no errors from setup.
6-
[ 2: PASS ] getError was expected value: NO_ERROR : fillTexture(8x8, level=2) should succeed
7-
[ 3: PASS ] getError was expected value: NO_ERROR : fillTexture(4x4, level=3) should succeed
8-
[ 4: PASS ] getError was expected value: NO_ERROR : fillTexture(2x2, level=4) should succeed
9-
[ 5: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_BASE_LEVEL) should succeed
10-
[ 6: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MAX_LEVEL) should succeed
11-
[ 7: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MAG_FILTER) should succeed
12-
[ 8: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MIN_FILTER) should succeed
13-
[ 9: PASS ] getError was expected value: NO_ERROR : clearAndDrawQuad should succeed
14-
[ 10: PASS ] should draw with [0, 0, 255, 255]
15-
[ 11: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
16-
[ 12: FAIL ] should draw with [255, 0, 0, 255] at (0, 0) expected: 255,0,0,255 was 0,0,0,255
17-
[ 13: PASS ] getError was expected value: NO_ERROR : fillTexture(8x8, level=2) should succeed
18-
[ 14: PASS ] getError was expected value: NO_ERROR : fillTexture(4x4, level=3) should succeed
19-
[ 15: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_BASE_LEVEL) should succeed
20-
[ 16: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MAX_LEVEL) should succeed
21-
[ 17: PASS ] getError was expected value: NO_ERROR : clearAndDrawQuad should succeed
22-
[ 18: PASS ] incomplete texture should draw with [0, 0, 0, 255]
23-
[ 19: PASS ] getError was expected value: NO_ERROR : fillTexture(8x8, level=2) should succeed
24-
[ 20: PASS ] getError was expected value: NO_ERROR : fillTexture(4x4, level=3) should succeed
25-
[ 21: PASS ] getError was expected value: NO_ERROR : fillTexture(2x2, level=4) should succeed
26-
[ 22: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_BASE_LEVEL) should succeed
27-
[ 23: PASS ] getError was expected value: INVALID_OPERATION : generateMipmap should fail if base level texture is not specified
28-
[ 24: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
29-
[ 25: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
30-
[ 26: PASS ] getError was expected value: NO_ERROR : texSubImage3D should succeed
31-
[ 27: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
32-
[ 28: PASS ] getError was expected value: NO_ERROR : texSubImage3D should succeed
33-
[ 29: PASS ] getError was one of: NO_ERROR or INVALID_OPERATION : generateMipmap should fail for zero-size texture
34-
[ 30: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
35-
[ 31: PASS ] getError was expected value: INVALID_OPERATION : generateMipmap should fail for non-texture-filterable format
36-
[ 32: PASS ] getError was expected value: INVALID_OPERATION : generateMipmap should fail for float texture
37-
[ 33: PASS ] getError was one of: NO_ERROR or INVALID_OPERATION : generateMipmap should fail for zero-size texture
38-
[ 34: PASS ] getError was expected value: NO_ERROR : generateMipmap should succeed
39-
[ 35: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MAG_FILTER) should succeed
40-
[ 36: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_MIN_FILTER) should succeed
41-
[ 37: PASS ] getError was expected value: NO_ERROR : texParameter(TEXTURE_BASE_LEVEL) should succeed
42-
[ 38: PASS ] getError was expected value: NO_ERROR : texStorage2D should succeed
43-
[ 39: PASS ] getError was expected value: NO_ERROR : clearAndDrawQuad should succeed
44-
[ 40: PASS ] should draw with [255, 0, 0, 255]
45-
[ 41: PASS ] successfullyParsed is true
46-
[ FAIL ] 1 failures reported
4+
[ PASS ] All tests passed

‎Source/ThirdParty/ANGLE/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
.git_cl_description_backup
3030
/src/tests/third_party/gles_conformance_tests
3131
/testing
32+
/third_party/abseil-cpp
3233
/third_party/android_ndk
3334
/third_party/catapult
3435
/third_party/cherry
@@ -42,6 +43,7 @@
4243
/third_party/libpng/src
4344
/third_party/llvm-build
4445
/third_party/nasm
46+
/third_party/protobuf
4547
/third_party/Python-Markdown
4648
/third_party/qemu-linux-x64
4749
/third_party/qemu-mac-x64
@@ -65,8 +67,12 @@
6567
/tools/flex-bison/windows/msys*.dll
6668
/tools/glslang/glslang_validator
6769
/tools/glslang/glslang_validator.exe
70+
/tools/luci-go
71+
/tools/mb
6872
/tools/md_browser
6973
/tools/memory
74+
/tools/protoc_wrapper
75+
/tools/skia_goldctl
7076
angle_debug.txt
7177
build
7278
buildtools/

‎Source/ThirdParty/ANGLE/.gn‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildconfig = "//build/config/BUILDCONFIG.gn"
1919
# "gn check" or "gn gen --check".
2020
check_targets = [ "*" ]
2121

22-
# These are the list of GN files that run exec_script. This whitelist exists
22+
# These are the list of GN files that run exec_script. This allowlist exists
2323
# to force additional review for new uses of exec_script, which is strongly
2424
# discouraged except for gypi_to_gn calls.
2525
exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
@@ -33,8 +33,10 @@ exec_script_whitelist = angle_dotfile_settings.exec_script_whitelist +
3333
]
3434

3535
default_args = {
36-
use_custom_libcxx = false
3736
clang_use_chrome_plugins = true
3837
build_angle_deqp_tests = true
3938
use_sysroot = true
39+
40+
# Saves on importing extra dependencies and ANGLE doesn't use JS.
41+
enable_js_protobuf = false
4042
}

0 commit comments

Comments
 (0)