commit aef5dc78f38af089e23f89bb20433690dcf43db6
author Brandon Jones <bajones@chromium.org> Thu Aug 05 12:53:36 2021 -0700
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Aug 06 00:42:34 2021 +0000
tree 67dd6e381cc513f27138f20bd97a7d04f705a6b0
parent 462e1882163021979eb51ca8786a7836a9383660

Update references to deprecated Dawn structure.

GPURenderPipelineDescriptor2 is a typedef of GPURenderPipelineDescriptor
in Dawn, so this change does not affect functionality. It will allow
Dawn to remove the deprecated type.

Bug: dawn:751
Change-Id: Id345f7feb92b4b4ec9d558acbca0d37e76b4c81f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/437076
Reviewed-by: John Stiles <johnstiles@google.com>
Auto-Submit: Brandon Jones <bajones@chromium.org>
Commit-Queue: John Stiles <johnstiles@google.com>

src/gpu/dawn/GrDawnGpu.cpp

diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index 0102b2f..ddf1e0b 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -737,7 +737,7 @@
     fragmentState.targetCount = 1;
     fragmentState.targets = &colorTargetState;
 
-    wgpu::RenderPipelineDescriptor2 renderPipelineDesc;
+    wgpu::RenderPipelineDescriptor renderPipelineDesc;
     renderPipelineDesc.vertex = vertexState;
     renderPipelineDesc.primitive.topology = wgpu::PrimitiveTopology::TriangleStrip;
     renderPipelineDesc.primitive.stripIndexFormat = wgpu::IndexFormat::Uint16;

src/gpu/dawn/GrDawnProgramBuilder.cpp

diff --git a/src/gpu/dawn/GrDawnProgramBuilder.cpp b/src/gpu/dawn/GrDawnProgramBuilder.cpp
index d9429a3..b585e9e 100644
--- a/src/gpu/dawn/GrDawnProgramBuilder.cpp
+++ b/src/gpu/dawn/GrDawnProgramBuilder.cpp
@@ -401,7 +401,7 @@
     fragmentState.targetCount = 1;
     fragmentState.targets = &colorTargetState;
 
-    wgpu::RenderPipelineDescriptor2 rpDesc;
+    wgpu::RenderPipelineDescriptor rpDesc;
     rpDesc.layout = pipelineLayout;
     rpDesc.vertex = vertexState;
     rpDesc.primitive.topology = to_dawn_primitive_topology(programInfo.primitiveType());