summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsFont.cpp
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-08-04 17:50:20 -0700
committerJason Sams <rjsams@android.com>2010-08-05 10:00:21 -0700
commit442a647424e6537e94341654e3ae5d52efd84862 (patch)
tree0a73c7551dceac6b4a81ee6ddb9b7f2ef11c89b4 /libs/rs/rsFont.cpp
parent208c425e842afed177801016c00c2c01bd8b44aa (diff)
downloadframeworks_base-442a647424e6537e94341654e3ae5d52efd84862.zip
frameworks_base-442a647424e6537e94341654e3ae5d52efd84862.tar.gz
frameworks_base-442a647424e6537e94341654e3ae5d52efd84862.tar.bz2
Support constant and varying colors in ProgramFragment.
Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
Diffstat (limited to 'libs/rs/rsFont.cpp')
-rw-r--r--libs/rs/rsFont.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp
index e58d8b1..a741adc 100644
--- a/libs/rs/rsFont.cpp
+++ b/libs/rs/rsFont.cpp
@@ -379,12 +379,12 @@ bool FontState::cacheBitmap(FT_Bitmap *bitmap, uint32_t *retOriginX, uint32_t *r
void FontState::initRenderState()
{
- uint32_t tmp[5] = {
+ uint32_t tmp[] = {
RS_TEX_ENV_MODE_REPLACE, 1,
RS_TEX_ENV_MODE_NONE, 0,
- 0
+ 0, 0
};
- ProgramFragment *pf = new ProgramFragment(mRSC, tmp, 5);
+ ProgramFragment *pf = new ProgramFragment(mRSC, tmp, 6);
mFontShaderF.set(pf);
mFontShaderF->init(mRSC);