Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 4f17b60

Browse files
zhenyaoSkia Commit-Bot
authored andcommitted
Use Dawn's BUILD.gn instead of defining another one for Skia.
Bug: chromium:1064305 Change-Id: I10ca629ff88a5492bb9f89075f6d92094340ff55 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/282076 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Zhenyao Mo <zmo@google.com>
1 parent 1b84ef2 commit 4f17b60

File tree

4 files changed

+17
-705
lines changed

4 files changed

+17
-705
lines changed

BUILD.gn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -578,11 +578,11 @@ optional("gpu") {
578578
if (skia_use_dawn) {
579579
public_defines += [ "SK_DAWN" ]
580580
sources += skia_dawn_sources
581-
public_deps += [ "//third_party/dawn:dawn_headers" ]
581+
public_deps += [ "//third_party/externals/dawn/src/dawn:dawn_headers" ]
582582
deps += [
583-
"//third_party/dawn:dawncpp",
584-
"//third_party/dawn:libdawn_native",
585-
"//third_party/dawn:libdawn_proc",
583+
"//third_party/externals/dawn/src/dawn:dawn_proc",
584+
"//third_party/externals/dawn/src/dawn:dawncpp",
585+
"//third_party/externals/dawn/src/dawn_native",
586586
]
587587
if (dawn_enable_d3d12) {
588588
libs += [
@@ -1220,7 +1220,7 @@ if (skia_enable_tools) {
12201220
]
12211221

12221222
if (skia_use_dawn) {
1223-
deps += [ "//third_party/dawn:dawn_headers" ]
1223+
deps += [ "//third_party/externals/dawn/src/dawn:dawn_headers" ]
12241224
}
12251225
}
12261226

@@ -1385,7 +1385,7 @@ if (skia_enable_tools) {
13851385
sources += [ "tools/gpu/d3d/D3DTestUtils.cpp" ]
13861386
}
13871387
if (skia_use_dawn) {
1388-
public_deps += [ "//third_party/dawn:dawn_headers" ]
1388+
public_deps += [ "//third_party/externals/dawn/src/dawn:dawn_headers" ]
13891389
sources += [ "tools/gpu/dawn/DawnTestContext.cpp" ]
13901390
cflags_cc = [ "-Wno-microsoft-cast" ]
13911391
}

build_overrides/dawn.gni

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
# many of these as possible. This will require updating Skia's
1111
# SPIRV-Tools and Shaderc at a minimum.
1212

13-
# skia/third_party/externals/jinja2 relative to skia/third_party/dawn/BUILD.gn
14-
dawn_jinja2_dir = "../externals/jinja2"
13+
# Skia doesn't have Chromium's //build directory. Tell Dawn to do without.
14+
dawn_has_build = false
1515

16-
# dawn_glfw_dir = "//third_party/glfw"
17-
# dawn_googletest_dir = "//third_party/googletest"
16+
dawn_jinja2_dir = "//third_party/externals/jinja2"
1817
dawn_shaderc_dir = "//third_party/shaderc"
1918
dawn_spirv_tools_dir = "//third_party/spirv-tools"
2019
dawn_spirv_cross_dir = "//third_party/spirv-cross"

0 commit comments

Comments
 (0)