diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-09-24 09:42:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-24 09:42:47 -0700 |
| commit | 04b5dd4b04df45eea0b568ac8d7ad5c4903c5cf5 (patch) | |
| tree | 66608bc318ced35d1f02b1d43d0d0bc8435c7c67 /graphics/java/android/renderscript/ProgramFragment.java | |
| parent | 5a049b0fffd98f5b6b61e43a01345c476d27c1f7 (diff) | |
| parent | b89aaacb2ca9d062e0a17a32e3d4dbf3f6948a17 (diff) | |
| download | frameworks_base-04b5dd4b04df45eea0b568ac8d7ad5c4903c5cf5.zip frameworks_base-04b5dd4b04df45eea0b568ac8d7ad5c4903c5cf5.tar.gz frameworks_base-04b5dd4b04df45eea0b568ac8d7ad5c4903c5cf5.tar.bz2 | |
Merge "Adding support for all allowed textures. Cleaning up unused code Adding error messages"
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
| -rw-r--r-- | graphics/java/android/renderscript/ProgramFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java index 00c5cf1..c1d6428 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/graphics/java/android/renderscript/ProgramFragment.java @@ -55,7 +55,7 @@ public class ProgramFragment extends Program { tmp[idx++] = 3; tmp[idx++] = mTextureCount; - int id = mRS.nProgramFragmentCreate2(mShader, tmp); + int id = mRS.nProgramFragmentCreate(mShader, tmp); ProgramFragment pf = new ProgramFragment(id, mRS); initProgram(pf); return pf; @@ -199,6 +199,7 @@ public class ProgramFragment extends Program { mNumTextures ++; } } + resetConstant(); buildShaderString(); Type constType = null; if (!mVaryingColorEnable) { |