summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/ProgramFragment.java
diff options
context:
space:
mode:
authorAlex Sakhartchouk <alexst@google.com>2010-09-23 16:16:33 -0700
committerAlex Sakhartchouk <alexst@google.com>2010-09-23 16:16:33 -0700
commitb89aaacb2ca9d062e0a17a32e3d4dbf3f6948a17 (patch)
tree01a6a7c86f5b91018a81d74f16320ce1ed207445 /graphics/java/android/renderscript/ProgramFragment.java
parent5eb22e2ce1cb46d18ce0c8e68e10a7f64bed01ea (diff)
Adding support for all allowed textures.
Cleaning up unused code Adding error messages Change-Id: I3a92476738ff7699d49feeafcd3eee6f70621acb
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
-rw-r--r--graphics/java/android/renderscript/ProgramFragment.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java
index 00c5cf1f18b9..c1d642866374 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) {