Commit 3cc46b70 authored by Adrienne Walker's avatar Adrienne Walker Committed by Commit Bot

Reland "skia: Add workaround header define"

This is a reland of b3fdac1b

Original change's description:
> skia: Add workaround header define
> 
> Chromium-side changes for:
> https://skia-review.googlesource.com/c/skia/+/120608
> 
> Bug: 829614
> Change-Id: I59dc05ae1d66622ce3c771311ec3e1b64023b66f
> Reviewed-on: https://chromium-review.googlesource.com/1008924
> Reviewed-by: Brian Salomon <bsalomon@chromium.org>
> Commit-Queue: enne <enne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#551370}

Bug: 829614
Change-Id: I206bed834a1819aea819648ba1f3ca486af94657
Reviewed-on: https://chromium-review.googlesource.com/1024310Reviewed-by: default avatarBrian Salomon <bsalomon@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552903}
parent a94fe046
...@@ -86,7 +86,11 @@ config("skia_config") { ...@@ -86,7 +86,11 @@ config("skia_config") {
if (enable_vulkan) { if (enable_vulkan) {
include_dirs += [ "//third_party/skia/include/gpu/vk/" ] include_dirs += [ "//third_party/skia/include/gpu/vk/" ]
} }
defines += [ "SK_SUPPORT_GPU=1" ] workaround_header = "gpu/config/gpu_driver_bug_workaround_autogen.h"
defines += [
"SK_SUPPORT_GPU=1",
"SK_GPU_WORKAROUNDS_HEADER=\"$workaround_header\"",
]
} else { } else {
defines += [ "SK_SUPPORT_GPU=0" ] defines += [ "SK_SUPPORT_GPU=0" ]
} }
...@@ -225,6 +229,7 @@ config("skia_library_config") { ...@@ -225,6 +229,7 @@ config("skia_library_config") {
} }
component("skia") { component("skia") {
deps = []
sources = [ sources = [
# Chrome sources. # Chrome sources.
"config/SkUserConfig.h", "config/SkUserConfig.h",
...@@ -357,6 +362,7 @@ component("skia") { ...@@ -357,6 +362,7 @@ component("skia") {
if (enable_vulkan) { if (enable_vulkan) {
sources += skia_vk_sources sources += skia_vk_sources
} }
deps += [ "//gpu/config:workaround_list" ]
} }
# Remove unused util sources. # Remove unused util sources.
...@@ -484,7 +490,7 @@ component("skia") { ...@@ -484,7 +490,7 @@ component("skia") {
] ]
public_configs = [ ":skia_config" ] public_configs = [ ":skia_config" ]
deps = [ deps += [
":skia_opts", ":skia_opts",
"//base", "//base",
"//base/third_party/dynamic_annotations", "//base/third_party/dynamic_annotations",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment