commit 2d8a95ee71b5a459eb7dfa26400bfd089e7b268a
author Robert Phillips <robertphillips@google.com> Thu Oct 10 12:50:22 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Oct 10 17:18:15 2019 +0000
tree d36aa8e772f9c15d42f0717c7b80315f878a241f
parent b484e7ce24c9d4505dec124a6bf5a3725ec5ac28

Add "meshCount" to GrProgramInfo

This improves the encapsulation of the GrProgramInfo class.

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

src/gpu/GrOpsRenderPass.cpp

diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index 548bbb4..1b8ebea 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -45,13 +45,9 @@
     SkASSERT(!programInfo.primProc().hasInstanceAttributes() ||
              this->gpu()->caps()->instanceAttribSupport());
 
-    for (int i = 0; i < meshCount; ++i) {
-        SkASSERT(programInfo.primProc().hasVertexAttributes() == meshes[i].hasVertexData());
-        SkASSERT(programInfo.primProc().hasInstanceAttributes() == meshes[i].hasInstanceData());
-    }
-
-    programInfo.checkAllInstantiated(meshCount);
-    programInfo.checkMSAAAndMIPSAreResolved(meshCount);
+    programInfo.compatibleWithMeshes(meshes, meshCount);
+    programInfo.checkAllInstantiated();
+    programInfo.checkMSAAAndMIPSAreResolved();
 #endif
 
     if (programInfo.primProc().numVertexAttributes() > this->gpu()->caps()->maxVertexAttributes()) {