Make setVertexAttribs in GrDrawState take a stride parameter.

Make setVertexAttribs in GrDrawState take a stride parameter.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/af013bf8afc4c77ab8ff230f536e2ade973427fa

Committed: https://skia.googlesource.com/skia/+/7b3d5ee72c2238aa239bce4d5b3aea98a437ca7a

[egdaniel, 2014-08-27 17:15:39]

egdaniel@google.com changed reviewers:
+ bsalomon@google.com

[bsalomon, 2014-08-27 17:46:28]

lgtm w/ minor suggestions.

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrAAHairLinePathRend...
File src/gpu/GrAAHairLinePathRenderer.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrAAHairLinePathRend...
src/gpu/GrAAHairLinePathRenderer.cpp:734:
drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs),
sizeof(LineVertex));
wrap?

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrBitmapTextContext.cpp
File src/gpu/GrBitmapTextContext.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrBitmapTextContext....
src/gpu/GrBitmapTextContext.cpp:531:
SK_ARRAY_COUNT(gTextVertexWithColorAttribs), 2 * sizeof(SkPoint) +
sizeof(GrColor));
Maybe capture these in some static consts with gText... arrays?

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrContext.cpp#newcod...
src/gpu/GrContext.cpp:954: *colorOffset = 2*sizeof(SkPoint);
static consts?

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.cpp
File src/gpu/GrDrawState.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.cpp#newc...
src/gpu/GrDrawState.cpp:181: static void validate_vertex_size(const
GrVertexAttrib* attribs, int count, size_t stride) {
validate_vertex_attribs?

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.h
File src/gpu/GrDrawState.h (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.h#newcod...
src/gpu/GrDrawState.h:567: *  @param count      the number of attributes being
set, limited to kMaxVertexAttribCnt.
update comment? Maybe move the params comments to the public method. Also, let's
rename this internalSetVertexAttribs or some such to make it easier to tell
which is being called.

[egdaniel, 2014-08-27 18:33:55]

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrAAHairLinePathRend...
File src/gpu/GrAAHairLinePathRenderer.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrAAHairLinePathRend...
src/gpu/GrAAHairLinePathRenderer.cpp:734:
drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs),
sizeof(LineVertex));
On 2014/08/27 17:46:27, bsalomon wrote:
> wrap?

Done.

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrBitmapTextContext.cpp
File src/gpu/GrBitmapTextContext.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrBitmapTextContext....
src/gpu/GrBitmapTextContext.cpp:531:
SK_ARRAY_COUNT(gTextVertexWithColorAttribs), 2 * sizeof(SkPoint) +
sizeof(GrColor));
On 2014/08/27 17:46:27, bsalomon wrote:
> Maybe capture these in some static consts with gText... arrays?

Done.

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrContext.cpp
File src/gpu/GrContext.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrContext.cpp#newcod...
src/gpu/GrContext.cpp:954: *colorOffset = 2*sizeof(SkPoint);
On 2014/08/27 17:46:27, bsalomon wrote:
> static consts?

Done.

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.cpp
File src/gpu/GrDrawState.cpp (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.cpp#newc...
src/gpu/GrDrawState.cpp:181: static void validate_vertex_size(const
GrVertexAttrib* attribs, int count, size_t stride) {
On 2014/08/27 17:46:27, bsalomon wrote:
> validate_vertex_attribs?

Done.

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.h
File src/gpu/GrDrawState.h (right):

https://codereview.chromium.org/511593004/diff/1/src/gpu/GrDrawState.h#newcod...
src/gpu/GrDrawState.h:567: *  @param count      the number of attributes being
set, limited to kMaxVertexAttribCnt.
On 2014/08/27 17:46:28, bsalomon wrote:
> update comment? Maybe move the params comments to the public method. Also,
let's
> rename this internalSetVertexAttribs or some such to make it easier to tell
> which is being called.

Done.

[egdaniel, 2014-08-27 18:33:59]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-08-27 18:34:52]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/egdaniel@google.com/511593004/40001

[commit-bot: I haz the power, 2014-08-27 18:42:26]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  Build-Mac10.8-Clang-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Mac10.8-Clang-x86_64-Release-Trybo...)
  Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-x86_64-Release-...)

[commit-bot: I haz the power, 2014-08-27 18:45:16]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-27 18:45:17]

Try jobs failed on following builders:
  Build-Ubuntu13.10-GCC4.8-x86_64-Release-Trybot on tryserver.skia
(http://108.170.220.76:10117/builders/Build-Ubuntu13.10-GCC4.8-x86_64-Release-...)

[egdaniel, 2014-08-27 18:59:18]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-08-27 19:00:04]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/egdaniel@google.com/511593004/60001

[commit-bot: I haz the power, 2014-08-27 19:00:09]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-27 19:00:10]

Failed to apply patch for src/gpu/GrBitmapTextContext.cpp:
While running git apply --index -p1;
  <stdin>:10: trailing whitespace.
  static const size_t kTextVASize = 2 * sizeof(SkPoint); 
  <stdin>:19: trailing whitespace.
  static const size_t kTextVAColorSize = 2 * sizeof(SkPoint) + sizeof(GrColor); 
  error: patch failed: src/gpu/GrBitmapTextContext.cpp:528
  error: src/gpu/GrBitmapTextContext.cpp: patch does not apply

Patch:       src/gpu/GrBitmapTextContext.cpp
Index: src/gpu/GrBitmapTextContext.cpp
diff --git a/src/gpu/GrBitmapTextContext.cpp b/src/gpu/GrBitmapTextContext.cpp
index
0c4d324d895b49ffb5236cfa86183830082a3229..6599d4ea473a719b2edbe8459047b494e31d10f1
100755
--- a/src/gpu/GrBitmapTextContext.cpp
+++ b/src/gpu/GrBitmapTextContext.cpp
@@ -40,6 +40,8 @@ extern const GrVertexAttrib gTextVertexAttribs[] = {
     {kVec2f_GrVertexAttribType, sizeof(SkPoint) ,
kEffect_GrVertexAttribBinding}
 };
 
+static const size_t kTextVASize = 2 * sizeof(SkPoint); 
+
 // position + color + texture coord
 extern const GrVertexAttrib gTextVertexWithColorAttribs[] = {
     {kVec2f_GrVertexAttribType,  0,                                
kPosition_GrVertexAttribBinding},
@@ -47,6 +49,8 @@ extern const GrVertexAttrib gTextVertexWithColorAttribs[] = {
     {kVec2f_GrVertexAttribType,  sizeof(SkPoint) + sizeof(GrColor),
kEffect_GrVertexAttribBinding}
 };
 
+static const size_t kTextVAColorSize = 2 * sizeof(SkPoint) + sizeof(GrColor); 
+
 };
 
 GrBitmapTextContext::GrBitmapTextContext(GrContext* context,
@@ -528,10 +532,10 @@ HAS_ATLAS:
         fMaxVertices = kMinRequestedVerts;
         if (useColorVerts) {
            
fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
+                SK_ARRAY_COUNT(gTextVertexWithColorAttribs), kTextVAColorSize);
         } else {
             fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                SK_ARRAY_COUNT(gTextVertexAttribs));
+                SK_ARRAY_COUNT(gTextVertexAttribs), kTextVASize);
         }
         bool flush = fDrawTarget->geometryHints(&fMaxVertices, NULL);
         if (flush) {
@@ -539,10 +543,10 @@ HAS_ATLAS:
             fContext->flush();
             if (useColorVerts) {
                
fDrawTarget->drawState()->setVertexAttribs<gTextVertexWithColorAttribs>(
-                  SK_ARRAY_COUNT(gTextVertexWithColorAttribs));
+                    SK_ARRAY_COUNT(gTextVertexWithColorAttribs),
kTextVAColorSize);
             } else {
                 fDrawTarget->drawState()->setVertexAttribs<gTextVertexAttribs>(
-                  SK_ARRAY_COUNT(gTextVertexAttribs));
+                    SK_ARRAY_COUNT(gTextVertexAttribs), kTextVASize);
             }
         }
         fMaxVertices = kDefaultRequestedVerts;
@@ -577,7 +581,7 @@ HAS_ATLAS:
     size_t vertSize = useColorVerts ? (2 * sizeof(SkPoint) + sizeof(GrColor)) :
                                       (2 * sizeof(SkPoint));
 
-    SkASSERT(vertSize == fDrawTarget->getDrawState().getVertexSize());
+    SkASSERT(vertSize == fDrawTarget->getDrawState().getVertexStride());
 
     SkPoint* positions = reinterpret_cast<SkPoint*>(
         reinterpret_cast<intptr_t>(fVertices) + vertSize * fCurrVertex);

[egdaniel, 2014-08-27 19:09:41]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-08-27 19:10:11]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/egdaniel@google.com/511593004/80001

[commit-bot: I haz the power, 2014-08-27 19:17:33]

Committed patchset #5 (id:80001) as af013bf8afc4c77ab8ff230f536e2ade973427fa

[djsollen, 2014-08-27 20:02:27]

A revert of this CL (patchset #5) has been created in
https://codereview.chromium.org/502533004/ by djsollen@google.com.

The reason for reverting is: GM failures on
http://108.170.220.120:10115/builders/Test-Ubuntu12-ShuttleA-GTX660-x86-Relea....

[egdaniel, 2014-08-27 20:13:43]

Patchset #5 (id:80001) has been deleted

[egdaniel, 2014-08-27 20:13:59]

The CQ bit was checked by egdaniel@google.com

[commit-bot: I haz the power, 2014-08-27 20:14:23]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/egdaniel@google.com/511593004/60001

[commit-bot: I haz the power, 2014-08-28 12:41:20]

Committed patchset #4 (id:60001) as 7b3d5ee72c2238aa239bce4d5b3aea98a437ca7a