AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Manually Roll ANGLE from 20eb9be55299 to f6659b3df028 (17 revisions)

Browse Source 
20eb9be552..f6659b3df0

ANGLE has updated the structure of their gn files. This CL updates Skia to match.

Change-Id: I20a735bbb3f4f119c5315627118a82d12df3f856
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/305518
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2020-07-23 10:16:10 -04:00
parent 1ec3b1ab2e
commit 98e6447f8a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -7,7 +7,7 @@ vars = {
deps = {
"buildtools" : "https://chromium.googlesource.com/chromium/buildtools.git@505de88083136eefd056e5ee4ca0f01fe9b33de8",
"common" : "https://skia.googlesource.com/common.git@9737551d7a52c3db3262db5856e6bcd62c462b92",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@f6659b3df0281485a743afeda56c6d0601bebf1b",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@f359cb667cb9a217f647844754a36c0eaa65ccfa",
# Dawn requires jinja2 and markupsafe for the code generator, and glslang and shaderc for SPIRV compilation.
# When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
"third_party/externals/dawn" : "https://dawn.googlesource.com/dawn.git@9061d5d154bc6456681b482c38849cdbddd86554",

15
third_party/angle2/BUILD.gn vendored
View File

@ -130,13 +130,14 @@ shared_library("libGLESv2") {
defines += [
# TODO: ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES
]
sources +=
rebase_path(libangle_gl_wgl_sources + libangle_d3d_shared_sources +
libangle_d3d9_sources + libangle_d3d11_sources +
libangle_d3d11_win32_sources +
libangle_gpu_info_util_win_sources,
".",
angle_root)
sources += rebase_path(
libangle_gl_wgl_sources + libangle_d3d_shared_sources +
libangle_d3d9_sources + libangle_d3d11_sources +
libangle_d3d11_win32_sources +
libangle_gl_wgl_d3d11_common_sources +
libangle_gpu_info_util_win_sources + libangle_d3d_win32_sources,
".",
angle_root)
libs += [
"d3d9.lib",
"dxgi.lib",