From: Brian Osman Date: Fri, 6 Jan 2017 16:26:42 +0000 (-0500) Subject: Get latest ANGLE as of January 6, 2017 X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~55^2~975 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=151d3b18fac381bc4d3d3b9017a9673bace889e5;p=platform%2Fupstream%2FlibSkiaSharp.git Get latest ANGLE as of January 6, 2017 Also add ANGLE ES3 predefined configs. BUG=skia: Change-Id: I28d87b0676395d047e49bbb926db330f76cf17bd Reviewed-on: https://skia-review.googlesource.com/6683 Reviewed-by: Brian Salomon Commit-Queue: Brian Osman --- diff --git a/DEPS b/DEPS index 60c7ce9..593f04b 100644 --- a/DEPS +++ b/DEPS @@ -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@ffd8f6223607e9d61de33467fcd113f2a15dae36", "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/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 0654d0e..6dcb2f1 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" }