Commit 687527b9 authored by Corentin Wallez's avatar Corentin Wallez Committed by Commit Bot

Remove the use of proxy Dawn GN group targets.

The GN targets have moved in Dawn and the former names are groups that
proxy to the name path. Change the paths in Chromium so that the proxy
groups can be removed in Dawn.

Bug: chromium:1064305
Change-Id: I75abda829d8677699bc0165d2fd27c4466a815cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2142213Reviewed-by: default avatarPeng Huang <penghuang@chromium.org>
Reviewed-by: default avatarStephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757505}
parent c946131d
...@@ -123,9 +123,9 @@ if (skia_use_dawn) { ...@@ -123,9 +123,9 @@ if (skia_use_dawn) {
deps = [ deps = [
"//base", "//base",
"//third_party/dawn:libdawn_native",
"//third_party/dawn/src/dawn:dawncpp", "//third_party/dawn/src/dawn:dawncpp",
"//third_party/dawn/src/dawn:libdawn_proc", "//third_party/dawn/src/dawn:libdawn_proc",
"//third_party/dawn/src/dawn_native",
] ]
} }
} }
......
...@@ -413,8 +413,9 @@ viz_source_set("gpu_service_dependencies") { ...@@ -413,8 +413,9 @@ viz_source_set("gpu_service_dependencies") {
public_deps += [ "//third_party/dawn/src/dawn:dawn_headers" ] public_deps += [ "//third_party/dawn/src/dawn:dawn_headers" ]
deps += [ deps += [
"//third_party/dawn:libdawn_native", "//third_party/dawn/src/dawn:dawncpp",
"//third_party/dawn/src/dawn:libdawn", "//third_party/dawn/src/dawn:libdawn_proc",
"//third_party/dawn/src/dawn_native",
] ]
} }
} }
......
...@@ -414,9 +414,9 @@ test("gl_tests") { ...@@ -414,9 +414,9 @@ test("gl_tests") {
if (use_dawn) { if (use_dawn) {
deps += [ deps += [
"//third_party/dawn:libdawn_native",
"//third_party/dawn/src/dawn:dawncpp", "//third_party/dawn/src/dawn:dawncpp",
"//third_party/dawn/src/dawn:libdawn_proc", "//third_party/dawn/src/dawn:libdawn_proc",
"//third_party/dawn/src/dawn_native",
] ]
} }
......
...@@ -176,7 +176,7 @@ source_set("webgpu_sources") { ...@@ -176,7 +176,7 @@ source_set("webgpu_sources") {
] ]
if (use_dawn) { if (use_dawn) {
deps += [ "//third_party/dawn:libdawn_wire" ] deps += [ "//third_party/dawn/src/dawn_wire" ]
} }
public_deps = [ public_deps = [
......
...@@ -368,7 +368,7 @@ target(link_target_type, "gles2_sources") { ...@@ -368,7 +368,7 @@ target(link_target_type, "gles2_sources") {
} }
if (use_dawn) { if (use_dawn) {
deps += [ "//third_party/dawn:libdawn_native" ] deps += [ "//third_party/dawn/src/dawn_native" ]
} }
if (is_mac) { if (is_mac) {
...@@ -390,7 +390,8 @@ target(link_target_type, "gles2_sources") { ...@@ -390,7 +390,8 @@ target(link_target_type, "gles2_sources") {
if (skia_use_dawn) { if (skia_use_dawn) {
deps += [ deps += [
"//components/viz/common:dawn_context_provider", "//components/viz/common:dawn_context_provider",
"//third_party/dawn/src/dawn:libdawn", "//third_party/dawn/src/dawn:dawncpp",
"//third_party/dawn/src/dawn:libdawn_proc",
] ]
} }
......
...@@ -521,8 +521,9 @@ component("skia") { ...@@ -521,8 +521,9 @@ component("skia") {
if (skia_use_dawn) { if (skia_use_dawn) {
public_deps += [ "//third_party/dawn/src/dawn:dawncpp_headers" ] public_deps += [ "//third_party/dawn/src/dawn:dawncpp_headers" ]
deps += [ deps += [
"//third_party/dawn:libdawn_native", "//third_party/dawn/src/dawn:dawncpp",
"//third_party/dawn/src/dawn:libdawn", "//third_party/dawn/src/dawn:libdawn_proc",
"//third_party/dawn/src/dawn_native",
] ]
} }
......
...@@ -139,7 +139,7 @@ bool WebGPUSwapBufferProvider::PrepareTransferableResource( ...@@ -139,7 +139,7 @@ bool WebGPUSwapBufferProvider::PrepareTransferableResource(
client_->OnTextureTransferred(); client_->OnTextureTransferred();
// Make Dawn relinquish access to the texture so it can be used by the // Make Dawn relinquish access to the texture so it can be used by the
// compositor. This will call dawn::Texture::Destroy so that further accesses // compositor. This will call wgpu::Texture::Destroy so that further accesses
// to the texture are errors. // to the texture are errors.
gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface(); gpu::webgpu::WebGPUInterface* webgpu = dawn_control_client_->GetInterface();
DCHECK_NE(wire_texture_id_, 0u); DCHECK_NE(wire_texture_id_, 0u);
......
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