e7bd1cb4f6
*** Manual roll with build fix for new FrameCapture setup ***
6c4ff5ddab..8be7a4c7f7
git log 6c4ff5ddab07..8be7a4c7f738 --date=short --no-merges --format='%ad %ae %s'
2019-09-21 jmadill@chromium.org Re-land "Vulkan: SwiftShader integration."
2019-09-21 jmadill@chromium.org Capture/Replay: Encapsulate cpp replay.
2019-09-21 jmadill@chromium.org Reland "Refactor built-in symbol table."
2019-09-21 zmo@chromium.org Revert "Refactor built-in symbol table."
2019-09-21 jmadill@chromium.org Capture/Replay: Move stub implementation to new file.
2019-09-20 ianelliott@google.com Vulkan: Enable most dEQP-GLES31.functional.state_query* tests to run
2019-09-20 geofflang@chromium.org GL: Treat unknown AHardwareBuffer formats as RGBA8.
2019-09-20 jmadill@chromium.org Refactor built-in symbol table.
2019-09-20 aukinros@microsoft.com Add support for generating UWP (Windows Store) projects again
2019-09-20 jmadill@chromium.org Vulkan: Track resource usage via counter.
2019-09-20 jmadill@chromium.org Vulkan: Pass CommandGraph when updating serials.
2019-09-20 angle-autoroll@skia-public.iam.gserviceaccount.com Roll ./third_party/glslang/src caca1d1cc46e..f7a48b153f2a (1 commits)
Created with:
gclient setdep -r third_party/externals/angle2@8be7a4c7f738
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 bungeman@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=bungeman@google.com
Change-Id: I8560c827bdf3694dc373dcf6c06220bdaafd6924
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/243197
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: 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("../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) {
|
|
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_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" ]
|
|
}
|
|
}
|