commit 34280e29cf54041d5c6a7f3b0669f0cfc2653f4e
author Chris Dalton <csmartdalton@google.com> Fri Dec 20 11:08:25 2019 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 20 21:01:39 2019 +0000
tree ede22db4433dcfd5aa1b7dedad5bedbb9e3bd358
parent aebe4390af5cff0ab5d8165920cc8c6a9f21847f

Shorten argument lists in GrMesh::SendToGpuImpl

Replaces several of the arguments with a single GrMesh object. The
call signatures were a bit unruly, and would have become more so with
extra required arguments for tessellation.

Change-Id: I4834b03d9c107dd233a91019c0a3189030e52bef
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260977
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrProgramInfo.cpp

diff --git a/src/gpu/GrProgramInfo.cpp b/src/gpu/GrProgramInfo.cpp
index bc36ae3..f561165 100644
--- a/src/gpu/GrProgramInfo.cpp
+++ b/src/gpu/GrProgramInfo.cpp
@@ -125,8 +125,8 @@
     SkASSERT(!fNumDynamicStateArrays || meshCount == fNumDynamicStateArrays);
 
     for (int i = 0; i < meshCount; ++i) {
-        SkASSERT(fPrimProc->hasVertexAttributes() == meshes[i].hasVertexData());
-        SkASSERT(fPrimProc->hasInstanceAttributes() == meshes[i].hasInstanceData());
+        SkASSERT(fPrimProc->hasVertexAttributes() == SkToBool(meshes[i].vertexBuffer()));
+        SkASSERT(fPrimProc->hasInstanceAttributes() == SkToBool(meshes[i].instanceBuffer()));
         if (fPipeline->usesConservativeRaster()) {
             // Conservative raster, by default, only supports triangles. Implementations can
             // optionally indicate that they also support points and lines, but we don't currently