commit b213ed8b767b424cb076bfbab11e936d16526635
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 25 15:22:12 2012 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jun 25 15:22:12 2012 +0000
tree d04843a79a3b46d906433633485eb4672dae164c
parent 1807d0d0de6b5d0273fc55e19c89be1709f07180

Simplify vertex layout bitfields by making Position-as-texcoords the
default.

http://codereview.appspot.com/6337050/



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

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 61f37ff..a49bf99 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -173,8 +173,6 @@
         if ((1 << i) & stageMask) {
             if (NULL != hasTexCoords && hasTexCoords[i]) {
                 layout |= GrDrawTarget::StageTexCoordVertexLayoutBit(i, i);
-            } else {
-                layout |= GrDrawTarget::StagePosAsTexCoordVertexLayoutBit(i);
             }
         }
     }
@@ -1574,7 +1572,7 @@
                                  matrix);
     drawState->sampler(0)->setRAndBSwap(swapRAndB);
 
-    GrVertexLayout layout = GrDrawTarget::StagePosAsTexCoordVertexLayoutBit(0);
+    static const GrVertexLayout layout = 0;
     static const int VCOUNT = 4;
     // TODO: Use GrGpu::drawRect here
     GrDrawTarget::AutoReleaseGeometry geo(fGpu, layout, VCOUNT, 0);