summaryrefslogtreecommitdiff
path: root/graphics/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-12-15 13:33:24 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-12-15 13:33:24 -0800
commitd6542507e73e1d7f3380cb4657a0745772818002 (patch)
tree4f3e38a86d46931a4e9fccc68f3021e7f3e44ba1 /graphics/java/android/renderscript/RenderScript.java
parent1890be79cfb59bf5e2976bbf3823ec0a510ac961 (diff)
parent7e5ab3b177b10fee304d011b3a4b9ee03e2b18b5 (diff)
Merge change I7e5ab3b1
* changes: Continue es2 shader dev
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
-rw-r--r--graphics/java/android/renderscript/RenderScript.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 75bd3d0e4f1d..0e4d5b02ce09 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -175,6 +175,7 @@ public class RenderScript {
native void nProgramFragmentSetSlot(int slot, boolean enable, int env, int vt);
native void nProgramFragmentSetShader(String txt);
native int nProgramFragmentCreate();
+ native int nProgramFragmentCreate2(String shader, int[] params);
native int nProgramVertexCreate(boolean texMat);
native int nProgramVertexCreate2(String shader, int[] params);