diff options
| author | Jason Sams <rjsams@android.com> | 2011-04-06 11:44:47 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2011-04-06 11:44:47 -0700 |
| commit | bd184c55850997a5c5e285357998dadbe95b7b5d (patch) | |
| tree | 01d90c1fdc2de53a65bf377980735d5d0557b336 | |
| parent | 331bf9b14b1c5c1e88f5c4092b6e24fae887fb3b (diff) | |
| download | frameworks_base-bd184c55850997a5c5e285357998dadbe95b7b5d.zip frameworks_base-bd184c55850997a5c5e285357998dadbe95b7b5d.tar.gz frameworks_base-bd184c55850997a5c5e285357998dadbe95b7b5d.tar.bz2 | |
Cleanup character limits.
Change-Id: Icb127248d6e3a0b662ed3b13c9a6646f4f81129a
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 6 | ||||
| -rw-r--r-- | libs/rs/rsFont.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 700c432..8f05dc3 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -492,7 +492,8 @@ public class RenderScript { boolean depthMask, boolean dither, int srcMode, int dstMode, int depthFunc) { validate(); - return rsnProgramStoreCreate(mContext, r, g, b, a, depthMask, dither, srcMode, dstMode, depthFunc); + return rsnProgramStoreCreate(mContext, r, g, b, a, depthMask, dither, srcMode, + dstMode, depthFunc); } native int rsnProgramRasterCreate(int con, boolean pointSmooth, boolean lineSmooth, @@ -500,7 +501,8 @@ public class RenderScript { synchronized int nProgramRasterCreate(boolean pointSmooth, boolean lineSmooth, boolean pointSprite, float lineWidth, int cullMode) { validate(); - return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite, lineWidth, cullMode); + return rsnProgramRasterCreate(mContext, pointSmooth, lineSmooth, pointSprite, lineWidth, + cullMode); } native void rsnProgramBindConstants(int con, int pv, int slot, int mID); diff --git a/libs/rs/rsFont.cpp b/libs/rs/rsFont.cpp index cb83435..c30b857 100644 --- a/libs/rs/rsFont.cpp +++ b/libs/rs/rsFont.cpp @@ -509,7 +509,8 @@ void FontState::initRenderState() { ProgramStore *fontStore = new ProgramStore(mRSC, true, true, true, true, false, false, - RS_BLEND_SRC_SRC_ALPHA, RS_BLEND_DST_ONE_MINUS_SRC_ALPHA, + RS_BLEND_SRC_SRC_ALPHA, + RS_BLEND_DST_ONE_MINUS_SRC_ALPHA, RS_DEPTH_FUNC_ALWAYS); mFontProgramStore.set(fontStore); mFontProgramStore->init(); |