diff options
author | Mike Klein <mtklein@google.com> | 2018-06-19 01:40:57 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 01:41:10 +0000 |
commit | 5045e501d2aec23e5f1e4b46346033ac3202c6b0 (patch) | |
tree | b0179c300d6bc1822b0d945be812fff267bb414a /src/gpu/GrPrimitiveProcessor.cpp | |
parent | 63b3bfb711d7e3d4f9ad75681d77a69a3c454ab0 (diff) |
Revert "Change how vertex/instance attributes are handled in geometry processors."
This reverts commit 19c1233c447f625c2522e7ecd0a0adecc629bb2f.
Reason for revert: want to make sure Google3 can roll
Original change's description:
> Change how vertex/instance attributes are handled in geometry processors.
>
> * No longer register vertex/instance attributes on base class, just counts
>
> * Separate instance and vertex attributes and remove InputRate and offset
>
> * Make attributes constexpr where possible
>
> Change-Id: I1f1d5e772fa177a96d2aeb805aab7b69f35bfae6
> Reviewed-on: https://skia-review.googlesource.com/132405
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Chris Dalton <csmartdalton@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: I4800632515e14fbf54af52826928ac915657b59f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/135661
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/gpu/GrPrimitiveProcessor.cpp')
-rw-r--r-- | src/gpu/GrPrimitiveProcessor.cpp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/gpu/GrPrimitiveProcessor.cpp b/src/gpu/GrPrimitiveProcessor.cpp index db79fb1052..7d1e1a644e 100644 --- a/src/gpu/GrPrimitiveProcessor.cpp +++ b/src/gpu/GrPrimitiveProcessor.cpp @@ -17,58 +17,6 @@ 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 { |