summaryrefslogtreecommitdiffstats
path: root/libs/rs/rsFont.cpp
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2010-11-18 15:22:43 -0800
committerAlex Sakhartchouk <alexst@google.com>2010-11-18 15:27:28 -0800
commit67f2e442a31b8395e3c1951f8e91139ec7f2be99 (patch)
tree9e3001eb5181faec98ac13fa85c7915fb8c96c1a /libs/rs/rsFont.cpp
parent3d019afcdb167a04d9c879285b448f9be1de3c67 (diff)
downloadframeworks_base-67f2e442a31b8395e3c1951f8e91139ec7f2be99.zip
frameworks_base-67f2e442a31b8395e3c1951f8e91139ec7f2be99.tar.gz
frameworks_base-67f2e442a31b8395e3c1951f8e91139ec7f2be99.tar.bz2
Support for cubemaps.
Change-Id: Iaf6087f614451a8e233b3e5bc49c834ab0ad08ee
Diffstat (limited to 'libs/rs/rsFont.cpp')
-rw-r--r--libs/rs/rsFont.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp
index e4d77b2..107022d 100644
--- a/libs/rs/rsFont.cpp
+++ b/libs/rs/rsFont.cpp
@@ -498,8 +498,8 @@ void FontState::initRenderState() {
uint32_t tmp[4];
tmp[0] = RS_PROGRAM_PARAM_CONSTANT;
tmp[1] = (uint32_t)inputType;
- tmp[2] = RS_PROGRAM_PARAM_TEXTURE_COUNT;
- tmp[3] = 1;
+ tmp[2] = RS_PROGRAM_PARAM_TEXTURE_TYPE;
+ tmp[3] = RS_TEXTURE_2D;
mFontShaderFConstant.set(new Allocation(mRSC, inputType));
ProgramFragment *pf = new ProgramFragment(mRSC, shaderString.string(),