commit 8531c1cea2a9cf7702ef314ccd0a6cd1dd33c76c
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Jan 13 19:52:45 2011 +0000
tree c760b89996fbc0c43eee1e100dcfee1a66ec4418
parent a76de3d1a92134c3e95ad7fce99234f92fa48268

Towards issue #106

Adds notion of texture multiple stages but currently just uses 1.


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

gpu/src/GrTextContext.cpp

diff --git a/gpu/src/GrTextContext.cpp b/gpu/src/GrTextContext.cpp
index 0264856..0a777d6 100644
--- a/gpu/src/GrTextContext.cpp
+++ b/gpu/src/GrTextContext.cpp
@@ -23,7 +23,9 @@
 #include "GrTextStrike_impl.h"
 #include "GrFontScaler.h"
 
-static const GrVertexLayout VLAYOUT = GrDrawTarget::kTextFormat_VertexLayoutBit;
+static const GrVertexLayout VLAYOUT = 
+                                GrDrawTarget::kTextFormat_VertexLayoutBit |
+                                GrDrawTarget::StageTexCoordVertexLayoutBit(0,0);
 
 void GrTextContext::flushGlyphs() {
     if (fCurrVertex > 0) {
@@ -33,15 +35,14 @@
 
         GrSamplerState sampler(GrSamplerState::kRepeat_WrapMode,
                                GrSamplerState::kRepeat_WrapMode,
-                               GrSamplerState::kAlphaMod_SampleMode,
                                !fExtMatrix.isIdentity());
-        fDrawTarget->setSamplerState(sampler);
+        fDrawTarget->setSamplerState(0, sampler);
 
         GrAssert(GrIsALIGN4(fCurrVertex));
         int nIndices = fCurrVertex + (fCurrVertex >> 1);
         GrAssert(fCurrTexture);
-        fDrawTarget->setTexture(fCurrTexture);
-        fDrawTarget->setTextureMatrix(GrMatrix::I());
+        fDrawTarget->setTexture(0, fCurrTexture);
+        fDrawTarget->setTextureMatrix(0, GrMatrix::I());
         fDrawTarget->setIndexSourceToBuffer(fContext->quadIndexBuffer());
 
         fDrawTarget->drawIndexed(GrDrawTarget::kTriangles_PrimitiveType,