56bf8ce97b
a54104803d..52d861bd49
git log a54104803d72..52d861bd49cc --date=short --no-merges --format='%ad %ae %s'
2019-02-02 syoussefi@chromium.org Disable -Wextra-semi-stmt
2019-02-02 ianelliott@google.com Implement EGL_ANDROID_recordable for Vulkan back-end.
2019-02-01 jonahr@google.com Fix unnecessary copy of for loop variables in ANGLE
2019-02-01 syoussefi@chromium.org Use env variable to select default backend
2019-02-01 jmadill@chromium.org Enable -Wextra-semi and -Wextra-semi-stmt.
2019-02-01 syoussefi@chromium.org Initial support for compiler AST validation
2019-02-01 jmadill@chromium.org Roll glslang.
2019-02-01 ckulakowski@opera.com Fix for linking of non-component angle_unittests
Created with:
gclient setdep -r third_party/externals/angle2@52d861bd49cc
The AutoRoll server is located here: https://autoroll.skia.org/r/angle-skia-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
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=borenet@google.com
Change-Id: I008df064f6301658404c371cf47a5656d8c11621
Reviewed-on: https://skia-review.googlesource.com/c/188852
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: skia-autoroll <skia-autoroll@skia-public.iam.gserviceaccount.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
141 lines
3.4 KiB
Plaintext
141 lines
3.4 KiB
Plaintext
# Copyright 2016 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
declare_args() {
|
|
}
|
|
|
|
angle_root = "../externals/angle2"
|
|
|
|
import("../third_party.gni")
|
|
import("$angle_root/src/compiler.gni")
|
|
import("$angle_root/src/libGLESv2.gni")
|
|
|
|
third_party("angle2") {
|
|
public_include_dirs = [ "$angle_root/include" ]
|
|
deps = [
|
|
":libEGL",
|
|
":libGLESv2",
|
|
]
|
|
}
|
|
|
|
config("common") {
|
|
defines = [
|
|
"ANGLE_ENABLE_ESSL",
|
|
"ANGLE_ENABLE_GLSL",
|
|
"ANGLE_ENABLE_HLSL",
|
|
"ANGLE_ENABLE_OPENGL",
|
|
"EGL_EGLEXT_PROTOTYPES",
|
|
"GL_GLEXT_PROTOTYPES",
|
|
]
|
|
include_dirs = [
|
|
"$root_gen_dir/angle2",
|
|
"$angle_root/include",
|
|
"$angle_root/src",
|
|
"$angle_root/src/common/third_party/base",
|
|
"$angle_root/src/third_party/khronos",
|
|
]
|
|
cflags_cc = []
|
|
assert(is_linux || is_win) # TODO: is_mac?
|
|
if (is_linux) {
|
|
defines += [
|
|
"ANGLE_USE_X11",
|
|
"GL_APICALL=__attribute__((visibility(\"default\")))",
|
|
"GL_API=__attribute__((visibility(\"default\")))",
|
|
"EGLAPI=__attribute__((visibility(\"default\")))",
|
|
]
|
|
cflags_cc += [ "-std=c++14" ]
|
|
} else if (is_win) {
|
|
defines += [
|
|
"ANGLE_ENABLE_D3D11",
|
|
"ANGLE_ENABLE_D3D9",
|
|
"GL_APICALL=",
|
|
"GL_API=",
|
|
"EGLAPI=",
|
|
]
|
|
|
|
# Allow noexcept, even though we build without exceptions
|
|
cflags_cc += [ "/wd4577" ]
|
|
if (is_clang) {
|
|
# utilities.cpp includes an 'unsigned long' <= UINT_MAX check
|
|
cflags_cc += [ "-Wno-tautological-constant-compare" ]
|
|
}
|
|
}
|
|
}
|
|
|
|
copy("commit_id") {
|
|
sources = [
|
|
"$angle_root/src/commit.h",
|
|
]
|
|
outputs = [
|
|
"$root_gen_dir/angle2/id/commit.h",
|
|
]
|
|
}
|
|
|
|
shared_library("libGLESv2") {
|
|
configs += [ ":common" ]
|
|
configs -= [ "//gn:warnings" ]
|
|
defines = [
|
|
"LIBANGLE_IMPLEMENTATION",
|
|
"LIBGLESV2_IMPLEMENTATION",
|
|
]
|
|
deps = [
|
|
":commit_id",
|
|
]
|
|
libs = []
|
|
sources = rebase_path(
|
|
angle_preprocessor_sources + angle_translator_sources +
|
|
angle_translator_essl_sources + angle_translator_glsl_sources +
|
|
angle_translator_hlsl_sources + libangle_sources +
|
|
libangle_common_sources + libangle_image_util_sources +
|
|
libglesv2_sources + libangle_gl_sources +
|
|
angle_system_utils_sources + xxhash_sources,
|
|
".",
|
|
angle_root)
|
|
if (is_win) {
|
|
sources += [ "$angle_root/src/libGLESv2/libGLESv2_autogen.def" ]
|
|
}
|
|
if (is_linux) {
|
|
libs += [
|
|
"X11",
|
|
"Xi",
|
|
"Xext",
|
|
]
|
|
sources += rebase_path(libangle_gl_glx_sources, ".", angle_root) +
|
|
[ "$angle_root/src/third_party/libXNVCtrl/NVCtrl.c" ]
|
|
} else if (is_win) {
|
|
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,
|
|
".",
|
|
angle_root)
|
|
libs += [
|
|
"d3d9.lib",
|
|
"dxguid.lib",
|
|
"gdi32.lib",
|
|
"user32.lib",
|
|
]
|
|
deps += [
|
|
# TODO: copy_compiler_dll?
|
|
]
|
|
}
|
|
}
|
|
|
|
shared_library("libEGL") {
|
|
configs += [ ":common" ]
|
|
configs -= [ "//gn:warnings" ]
|
|
defines = [ "LIBEGL_IMPLEMENTATION" ]
|
|
deps = [
|
|
":libGLESv2",
|
|
]
|
|
sources = rebase_path(libegl_sources, ".", angle_root)
|
|
if (is_win) {
|
|
sources += [ "$angle_root/src/libEGL/libEGL.def" ]
|
|
}
|
|
}
|