|
@@ -60,7 +60,6 @@ void FontRenderBatcher::render( F32 rot, const Point2F &offset )
|
|
|
return;
|
|
|
|
|
|
GFX->setStateBlock(mFontSB);
|
|
|
- GFX->disableShaders();
|
|
|
for(U32 i = 0; i < GFX->getNumSamplers(); i++)
|
|
|
GFX->setTexture(i, NULL);
|
|
|
|
|
@@ -177,6 +176,7 @@ void FontRenderBatcher::render( F32 rot, const Point2F &offset )
|
|
|
AssertFatal(currentPt <= mLength * 6, "FontRenderBatcher::render - too many verts for length of string!");
|
|
|
|
|
|
GFX->setVertexBuffer(verts);
|
|
|
+ GFX->setupGenericShaders( GFXDevice::GSAddColorTexture );
|
|
|
|
|
|
// Now do an optimal render!
|
|
|
for( S32 i = 0; i < mSheets.size(); i++ )
|
|
@@ -186,8 +186,7 @@ void FontRenderBatcher::render( F32 rot, const Point2F &offset )
|
|
|
|
|
|
if(!mSheets[i]->numChars )
|
|
|
continue;
|
|
|
-
|
|
|
- GFX->setupGenericShaders( GFXDevice::GSAddColorTexture );
|
|
|
+
|
|
|
GFX->setTexture( 0, mFont->getTextureHandle(i) );
|
|
|
GFX->drawPrimitive(GFXTriangleList, mSheets[i]->startVertex, mSheets[i]->numChars * 2);
|
|
|
}
|