diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-11-18 15:58:17 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-18 15:58:17 -0800 |
| commit | a3326781352888ff80fcf920cf93fd738bb69e66 (patch) | |
| tree | 91c55f677b294cad2ee7e078d4d820a7bea17598 /libs/rs/rsFont.cpp | |
| parent | 04d93980ec2af55c04963a2b67f628d72ea7fe5f (diff) | |
| parent | 67f2e442a31b8395e3c1951f8e91139ec7f2be99 (diff) | |
| download | frameworks_base-a3326781352888ff80fcf920cf93fd738bb69e66.zip frameworks_base-a3326781352888ff80fcf920cf93fd738bb69e66.tar.gz frameworks_base-a3326781352888ff80fcf920cf93fd738bb69e66.tar.bz2 | |
Merge "Support for cubemaps."
Diffstat (limited to 'libs/rs/rsFont.cpp')
| -rw-r--r-- | libs/rs/rsFont.cpp | 4 |
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(), |