cf70c3333c
*** Manual roll including a build fix ***
2328d65ab3..5549ef0451
git log 2328d65ab30d..5549ef0451f9 --date=short --no-merges --format='%ad %ae %s'
2019-10-04 m.maiya@samsung.com Vulkan: Fix content synchronization for textures bound to images
2019-10-03 timvp@google.com Trigger a flush() when the command graph contains too many objects
2019-10-03 jmadill@chromium.org Re-land "GN: Componentize vulkan back-end build."
2019-10-03 geofflang@chromium.org GL: Refactor BlitGL program types into tuples of enums.
2019-10-03 timvp@google.com Only enable shader array size restrictions for HLSL
2019-10-03 jonahr@google.com Keep state up to date after bindBufferBase/Range
2019-10-03 shrekshao@google.com Fix redundant draw in DrawBaseVertexBaseInstanceTest
2019-10-03 m.maiya@samsung.com Vulkan: Disable OES_vertex_type_10_10_10_2 on GLES 2.0
Created with:
gclient setdep -r third_party/externals/angle2@5549ef0451f9
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/angle-skia-autoroll
Please CC rmistry@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-x86_64-Release-ANGLE;skia.primary:Test-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE;skia.primary:Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE
Bug: None
TBR=rmistry@google.com
Change-Id: Id9513b82fb29cb0500ed0708f0a6fe70dd3dee30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/246596
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
148 lines
3.7 KiB
Plaintext
148 lines
3.7 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("$angle_root/src/compiler.gni")
|
|
import("$angle_root/src/libGLESv2.gni")
|
|
import("../third_party.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) {
|
|
cflags_cc += [
|
|
# utilities.cpp includes an 'unsigned long' <= UINT_MAX check
|
|
"-Wno-tautological-constant-compare",
|
|
|
|
# With distributed Windows builds, files may lose their case during copy, causing
|
|
# case-sensitivity mismatch on remote machines.
|
|
"-Wno-nonportable-include-path",
|
|
]
|
|
}
|
|
}
|
|
}
|
|
|
|
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_headers + libangle_common_sources +
|
|
libangle_image_util_sources + libglesv2_sources +
|
|
libangle_gl_sources + angle_system_utils_sources + xxhash_sources,
|
|
".",
|
|
angle_root) + [ "$angle_root/src/libANGLE/FrameCapture_mock.cpp" ]
|
|
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" ]
|
|
}
|
|
}
|