summaryrefslogtreecommitdiff
path: root/libs/rs/rsFont.cpp
diff options
context:
space:
mode:
author Alex Sakhartchouk <alexst@google.com> 2010-07-12 15:50:32 -0700
committer Alex Sakhartchouk <alexst@google.com> 2010-07-12 15:50:32 -0700
commit80a4c2cd34aedb4f1a2e5e7d1ac26a9aeebe41ae (patch)
tree1add64a0dee5bf0ac1c98b63bd3b43648ca7af50 /libs/rs/rsFont.cpp
parentcefd8d9588230577356d24597acc04ce1e276582 (diff)
Work on synchronizing a3d created files and java layer.
Adding culling to ProgramRaster Change-Id: I58ccc82d37edc9539289d5eba44ea0e720874af5
Diffstat (limited to 'libs/rs/rsFont.cpp')
-rw-r--r--libs/rs/rsFont.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp
index 2a47ca4f9184..d1346fc01dc8 100644
--- a/libs/rs/rsFont.cpp
+++ b/libs/rs/rsFont.cpp
@@ -511,6 +511,9 @@ void FontState::issueDrawCommand() {
ObjectBaseRef<const ProgramVertex> tmpV(mRSC->getVertex());
mRSC->setVertex(mRSC->getDefaultProgramVertex());
+ ObjectBaseRef<const ProgramRaster> tmpR(mRSC->getRaster());
+ mRSC->setRaster(mRSC->getDefaultProgramRaster());
+
ObjectBaseRef<const ProgramFragment> tmpF(mRSC->getFragment());
mRSC->setFragment(mFontShaderF.get());
@@ -519,6 +522,7 @@ void FontState::issueDrawCommand() {
if (!mRSC->setupCheck()) {
mRSC->setVertex((ProgramVertex *)tmpV.get());
+ mRSC->setRaster((ProgramRaster *)tmpR.get());
mRSC->setFragment((ProgramFragment *)tmpF.get());
mRSC->setFragmentStore((ProgramStore *)tmpPS.get());
return;
@@ -538,6 +542,7 @@ void FontState::issueDrawCommand() {
// Reset the state
mRSC->setVertex((ProgramVertex *)tmpV.get());
+ mRSC->setRaster((ProgramRaster *)tmpR.get());
mRSC->setFragment((ProgramFragment *)tmpF.get());
mRSC->setFragmentStore((ProgramStore *)tmpPS.get());
}