commit cbe4f6a42273c2058f1393f7dfa69e4871787ccd
author jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 06 13:45:11 2013 +0000
committer jvanverth@google.com <jvanverth@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Feb 06 13:45:11 2013 +0000
tree 129f47258224bf8137c6c2fd116af20611ce324e
parent 90096b619b5466d13357d1302ed2488889ff048d

Set vertex layout prior to setVertexSourceToBuffer for GR_STATIC_RECT_VB


git-svn-id: http://skia.googlecode.com/svn/trunk@7612 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 3f3768a..0480c08 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -780,8 +780,10 @@
                 GrPrintf("Failed to create static rect vb.\n");
                 return;
             }
-            target->setVertexSourceToBuffer(sqVB);
+
             GrDrawState* drawState = target->drawState();
+            drawState->setVertexLayout(GrDrawState::kDefault_VertexLayout);
+            target->setVertexSourceToBuffer(sqVB);
             SkMatrix m;
             m.setAll(rect.width(),    0,             rect.fLeft,
                         0,            rect.height(), rect.fTop,
@@ -846,6 +848,7 @@
         GrPrintf("Failed to create static rect vb.\n");
         return;
     }
+    drawState->setVertexLayout(GrDrawState::kDefault_VertexLayout);
     target->setVertexSourceToBuffer(sqVB);
     target->drawNonIndexed(kTriangleFan_GrPrimitiveType, 0, 4);
 #else