Skip to content

Commit

Permalink
Add skia GL-only build constructs.
Browse files Browse the repository at this point in the history
A pending change to skia will delineate GL-only sources from
multi-GPU interface source lists in the build configuration.
This change serializes the integration of that change between
the two repos.

Change-Id: I12bdc14228fbc9bd56214301fa7ab02eff5b2efc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1910870
Commit-Queue: John Rosasco <rosasco@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Cr-Commit-Position: refs/heads/master@{#714590}
  • Loading branch information
rosasco-wk authored and Commit Bot committed Nov 12, 2019
1 parent b43fc00 commit ed5faa8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,15 @@ config("skia_config") {
}

defines = [
"SK_GL",
"SK_HAS_PNG_LIBRARY",
"SK_HAS_WEBP_LIBRARY",
"SK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\"",
]

if (skia_use_gl) {
defines += [ "SK_GL" ]
}

if (!is_ios) {
defines += [ "SK_HAS_JPEG_LIBRARY" ]
if (enable_skia_wuffs_gif) {
Expand Down Expand Up @@ -569,6 +572,9 @@ component("skia") {
sources += skia_gpu_sources
sources += skia_null_gpu_sources
sources += skia_sksl_gpu_sources
if (skia_use_gl) {
sources += skia_gl_gpu_sources
}
if (enable_vulkan) {
sources += skia_vk_sources
sources += [
Expand Down
1 change: 1 addition & 0 deletions skia/features.gni
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
declare_args() {
# Enable experimental SkiaRenderer Dawn backend.
skia_use_dawn = false
skia_use_gl = true
}

0 comments on commit ed5faa8

Please sign in to comment.