From 19c1233c447f625c2522e7ecd0a0adecc629bb2f Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 18 Jun 2018 12:52:47 -0400 Subject: 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 Reviewed-by: Chris Dalton --- tests/OnFlushCallbackTest.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tests/OnFlushCallbackTest.cpp') diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp index e2f6fbf9e1..a8752057c8 100644 --- a/tests/OnFlushCallbackTest.cpp +++ b/tests/OnFlushCallbackTest.cpp @@ -110,11 +110,10 @@ private: return; } - size_t vertexStride = gp->getVertexStride(); - - SkASSERT(fHasLocalRect - ? vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr) - : vertexStride == sizeof(GrDefaultGeoProcFactory::PositionColorAttr)); + size_t vertexStride = fHasLocalRect + ? sizeof(GrDefaultGeoProcFactory::PositionColorLocalCoordAttr) + : sizeof(GrDefaultGeoProcFactory::PositionColorAttr); + SkASSERT(vertexStride == gp->debugOnly_vertexStride()); const GrBuffer* indexBuffer; int firstIndex; -- cgit v1.2.3