aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-01-10 13:31:33 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-11 15:12:40 +0000
commit21d742dbafde600d7f0d3b7de95cd083dd54ad97 (patch)
tree427cb6dcbffc7215d73629b81847776eb2522dfc /third_party
parent34855f9e1c40bf91d2bdbd34b32868eb06327c9f (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>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/angle2/BUILD.gn17
1 files changed, 6 insertions, 11 deletions
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" ]
}