commit fcaae486d78a0d784a1b19d9d6f6eaa0928d91df
author Robert Phillips <robertphillips@google.com> Thu Nov 07 10:17:03 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 07 16:15:04 2019 +0000
tree a27692bc487ad66878fa09d3b5a0fdbe15ada544
parent 297d5a03e603112afefbf81717d359b925b2bd6a

Use GrProgramInfo's primitiveType field

This improves the encapsulation of all the data required to make a program/pipeline w/in the GrProgramInfo class.

Bug: skia:9455
Change-Id: Ib41519c8ded9f27a7bbe787097a431b38ab101bd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253376
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/dawn/GrDawnProgramBuilder.cpp

diff --git a/src/gpu/dawn/GrDawnProgramBuilder.cpp b/src/gpu/dawn/GrDawnProgramBuilder.cpp
index e63cd9a..8c3a107 100644
--- a/src/gpu/dawn/GrDawnProgramBuilder.cpp
+++ b/src/gpu/dawn/GrDawnProgramBuilder.cpp
@@ -291,7 +291,6 @@
 sk_sp<GrDawnProgram> GrDawnProgramBuilder::Build(GrDawnGpu* gpu,
                                                  GrRenderTarget* renderTarget,
                                                  const GrProgramInfo& programInfo,
-                                                 GrPrimitiveType primitiveType,
                                                  wgpu::TextureFormat colorFormat,
                                                  bool hasDepthStencil,
                                                  wgpu::TextureFormat depthStencilFormat,
@@ -415,7 +414,7 @@
     rpDesc.vertexStage = vsDesc;
     rpDesc.fragmentStage = &fsDesc;
     rpDesc.vertexInput = &vertexInput;
-    rpDesc.primitiveTopology = to_dawn_primitive_topology(primitiveType);
+    rpDesc.primitiveTopology = to_dawn_primitive_topology(programInfo.primitiveType());
     if (hasDepthStencil) {
         rpDesc.depthStencilState = &depthStencilState;
     }