diff options
author | Brian Osman <brianosman@google.com> | 2017-01-10 13:31:33 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 15:12:40 +0000 |
commit | 21d742dbafde600d7f0d3b7de95cd083dd54ad97 (patch) | |
tree | 427cb6dcbffc7215d73629b81847776eb2522dfc | |
parent | 34855f9e1c40bf91d2bdbd34b32868eb06327c9f (diff) |
Get latest ANGLE as of January 6, 2017
Also add ANGLE ES3 predefined configs.
BUG=skia:
CQ_INCLUDE_TRYBOTS=skia.primary:Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE
Change-Id: Ib7394afa961da1afe91c6dfefe08528273d3087c
Reviewed-on: https://skia-review.googlesource.com/6698
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | gn/BUILD.gn | 2 | ||||
-rw-r--r-- | third_party/angle2/BUILD.gn | 17 | ||||
-rw-r--r-- | tools/flags/SkCommonFlagsConfig.cpp | 2 |
4 files changed, 11 insertions, 12 deletions
@@ -10,7 +10,7 @@ deps = { # There is some duplication here that might be worth cleaning up: # - can use use our existing t_p/e/libjpeg instead of pulling it for Android? - "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@d445357315299e30c18c756f657ff928653128c2", + "third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@57f17473791703ac82add77c3d77d13d8e2dfbc4", "third_party/externals/freetype": "https://skia.googlesource.com/third_party/freetype2.git@08fd250e1af0aa16d18012d39462e6ca9bbc6e90", "third_party/externals/gyp" : "https://chromium.googlesource.com/external/gyp.git@87ac4d0e63fc7dd8152a350327fea8dcf031bf56", "third_party/externals/harfbuzz": "https://skia.googlesource.com/third_party/harfbuzz.git@1.3.0", diff --git a/gn/BUILD.gn b/gn/BUILD.gn index 42bb8c9556..97e5368fdb 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -82,11 +82,13 @@ config("default") { "$windk/../Windows Kits/10/Include/10.0.10150.0/ucrt", "$windk/../Windows Kits/8.1/Include/shared", "$windk/../Windows Kits/8.1/Include/um", + "$windk/../Windows Kits/8.1/Include/winrt", # For builds using win_toolchain asset. "$windk/win_sdk/Include/10.0.14393.0/shared", "$windk/win_sdk/Include/10.0.14393.0/ucrt", "$windk/win_sdk/Include/10.0.14393.0/um", + "$windk/win_sdk/Include/10.0.14393.0/winrt", ] lib_dirs = [ # For local builds. diff --git a/third_party/angle2/BUILD.gn b/third_party/angle2/BUILD.gn index cc45284b79..b6bec35c74 100644 --- a/third_party/angle2/BUILD.gn +++ b/third_party/angle2/BUILD.gn @@ -82,22 +82,17 @@ shared_library("libGLESv2") { ":commit_id", ] libs = [] - sources = - rebase_path( + sources = rebase_path( compiler_gypi.angle_preprocessor_sources + - compiler_gypi.angle_translator_lib_sources + - compiler_gypi.angle_translator_lib_essl_sources + - compiler_gypi.angle_translator_lib_glsl_sources + - compiler_gypi.angle_translator_lib_hlsl_sources + + compiler_gypi.angle_translator_sources + + compiler_gypi.angle_translator_essl_sources + + compiler_gypi.angle_translator_glsl_sources + + compiler_gypi.angle_translator_hlsl_sources + gles_gypi.libangle_sources + gles_gypi.libangle_common_sources + gles_gypi.libangle_image_util_sources + gles_gypi.libglesv2_sources + gles_gypi.libangle_gl_sources, ".", - "$angle_root/src") + - [ - "$angle_root/src/compiler/translator/ShaderLang.cpp", - "$angle_root/src/compiler/translator/ShaderVars.cpp", - ] + "$angle_root/src") if (!is_win) { sources -= [ "$angle_root/src/libGLESv2/libGLESv2.def" ] } diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 0654d0e5ae..6dcb2f104d 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -58,9 +58,11 @@ static const struct { { "debug", "gpu", "api=debug" }, { "nullgpu", "gpu", "api=null" }, { "angle_d3d11_es2", "gpu", "api=angle_d3d11_es2" }, + { "angle_d3d11_es3", "gpu", "api=angle_d3d11_es3" }, { "angle_d3d9_es2", "gpu", "api=angle_d3d9_es2" }, { "angle_d3d11_es2_msaa4", "gpu", "api=angle_d3d11_es2,samples=4" }, { "angle_gl_es2", "gpu", "api=angle_gl_es2" }, + { "angle_gl_es3", "gpu", "api=angle_gl_es3" }, { "commandbuffer", "gpu", "api=commandbuffer" } #if SK_MESA ,{ "mesa", "gpu", "api=mesa" } |