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

Roll third_party/externals/angle2/ 5d2ccc534..a00ef3144 (10 commits)

Browse Source 
Manual roll including GN fixes

5d2ccc534d..a00ef3144f

$ git log 5d2ccc534..a00ef3144 --date=short --no-merges --format='%ad %ae %s'
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 cwallez DisplayGLX: Close the X display if we own it.
2018-05-14 geofflang Add more dEQP EGL expectations for Linux and Android.
2018-05-14 geofflang DEQP: Print not supported messages from tests.
2018-05-14 geofflang Add dEQP EGL test expectations for Linux and Android.
2018-05-10 jmadill Vulkan: Implement masked color clear with depth.
2018-05-14 jmadill Fix libGLESv2 wrong .def file.
2018-05-14 jmadill Fix warnings from size_t conversions.
2018-04-23 lfy GLES1: Renderer (minimal)

CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE
TBR=herb@google.com

Change-Id: I0ed2b9c8824b7833a4a0234204cb849805717daa
Reviewed-on: https://skia-review.googlesource.com/128322
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Brian Osman 2018-05-15 10:43:08 -04:00 committed by Skia Commit-Bot
parent 44a9d5726d
commit 64a1d4a7fc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -3,7 +3,7 @@ use_relative_paths = True
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@5d2ccc534d26cc1801dd82479d647cce84ba25e2",
"third_party/externals/angle2" : "https://chromium.googlesource.com/angle/angle.git@74a763205a3d3226011e2aba247cded5ff08ce3a",
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
"third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-6.0.1_r55",
"third_party/externals/freetype" : "https://skia.googlesource.com/third_party/freetype2.git@fa6da7bf6dcbcfa22d2464259ad1cccee3233189",

9
third_party/angle2/BUILD.gn vendored
View File

@ -103,10 +103,9 @@ shared_library("libGLESv2") {
gles_gypi.libglesv2_sources + gles_gypi.libangle_gl_sources,
".",
"$angle_root/src")
if (!is_win) {
sources -= [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ]
if (is_win) {
sources += [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ]
}
if (is_linux) {
libs += [
"X11",
@ -150,7 +149,7 @@ shared_library("libEGL") {
":libGLESv2",
]
sources = rebase_path(gles_gypi.libegl_sources, ".", "$angle_root/src")
if (!is_win) {
sources -= [ "$angle_root/src/libEGL/libEGL.def" ]
if (is_win) {
sources += [ "$angle_root/src/libEGL/libEGL.def" ]
}
}