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/gl/GrGLGpuProgramCache.cpp

diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/gl/GrGLGpuProgramCache.cpp
index 592605e..08260c0 100644
--- a/src/gpu/gl/GrGLGpuProgramCache.cpp
+++ b/src/gpu/gl/GrGLGpuProgramCache.cpp
@@ -47,13 +47,12 @@
 
 GrGLProgram* GrGLGpu::ProgramCache::refProgram(GrGLGpu* gpu,
                                                GrRenderTarget* renderTarget,
-                                               const GrProgramInfo& programInfo,
-                                               GrPrimitiveType primitiveType) {
+                                               const GrProgramInfo& programInfo) {
     // TODO: can this be unified between GL, Vk and Mtl?
     // Get GrGLProgramDesc
     GrProgramDesc desc;
 
-    if (!GrProgramDesc::Build(&desc, renderTarget, programInfo, primitiveType, gpu)) {
+    if (!GrProgramDesc::Build(&desc, renderTarget, programInfo, gpu)) {
         GrCapsDebugf(gpu->caps(), "Failed to gl program descriptor!\n");
         return nullptr;
     }