Revert "Revert "Change how vertex/instance attributes are handled in geometry processors.""

This reverts commit 5045e501d2aec23e5f1e4b46346033ac3202c6b0.

TBR=csmartdalton@google.com

Change-Id: Ifbf5f1d8f8ef340fdc69653e931b6d68d4bf0854
Reviewed-on: https://skia-review.googlesource.com/135862
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 52 insertions, 0 deletions

diff --git a/src/gpu/GrPrimitiveProcessor.cpp b/src/gpu/GrPrimitiveProcessor.cpp
index 7d1e1a644e..db79fb1052 100644
--- a/src/gpu/GrPrimitiveProcessor.cpp
+++ b/src/gpu/GrPrimitiveProcessor.cpp
@@ -17,6 +17,58 @@ enum MatrixType {
     kGeneral_MatrixType  = 1,
 };
 
+GrPrimitiveProcessor::GrPrimitiveProcessor(ClassID classID) : GrResourceIOProcessor(classID) {}
+
+const GrPrimitiveProcessor::Attribute& GrPrimitiveProcessor::vertexAttribute(int i) const {
+    SkASSERT(i >= 0 && i < this->numVertexAttributes());
+    const auto& result = this->onVertexAttribute(i);
+    SkASSERT(result.isInitialized());
+    return result;
+}
+
+const GrPrimitiveProcessor::Attribute& GrPrimitiveProcessor::instanceAttribute(int i) const {
+    SkASSERT(i >= 0 && i < this->numInstanceAttributes());
+    const auto& result = this->onInstanceAttribute(i);
+    SkASSERT(result.isInitialized());
+    return result;
+}
+
+#ifdef SK_DEBUG
+size_t GrPrimitiveProcessor::debugOnly_vertexStride() const {
+    size_t stride = 0;
+    for (int i = 0; i < fVertexAttributeCnt; ++i) {
+        stride += this->vertexAttribute(i).sizeAlign4();
+    }
+    return stride;
+}
+
+size_t GrPrimitiveProcessor::debugOnly_instanceStride() const {
+    size_t stride = 0;
+    for (int i = 0; i < fInstanceAttributeCnt; ++i) {
+        stride += this->instanceAttribute(i).sizeAlign4();
+    }
+    return stride;
+}
+
+size_t GrPrimitiveProcessor::debugOnly_vertexAttributeOffset(int i) const {
+    SkASSERT(i >= 0 && i < fVertexAttributeCnt);
+    size_t offset = 0;
+    for (int j = 0; j < i; ++j) {
+        offset += this->vertexAttribute(j).sizeAlign4();
+    }
+    return offset;
+}
+
+size_t GrPrimitiveProcessor::debugOnly_instanceAttributeOffset(int i) const {
+    SkASSERT(i >= 0 && i < fInstanceAttributeCnt);
+    size_t offset = 0;
+    for (int j = 0; j < i; ++j) {
+        offset += this->instanceAttribute(j).sizeAlign4();
+    }
+    return offset;
+}
+#endif
+
 uint32_t
 GrPrimitiveProcessor::getTransformKey(const SkTArray<const GrCoordTransform*, true>& coords,
                                       int numCoords) const {