Beging GL2 user shaders. Switch master to using GL2 by default.
diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java
index 392d93d..f8625e8 100644
--- a/graphics/java/android/renderscript/ProgramFragment.java
+++ b/graphics/java/android/renderscript/ProgramFragment.java
@@ -69,6 +69,7 @@
Element mIn;
Element mOut;
boolean mPointSpriteEnable;
+ String mShader;
private class Slot {
Type mType;
@@ -92,6 +93,10 @@
}
}
+ public void setShader(String s) {
+ mShader = s;
+ }
+
public void setType(int slot, Type t)
throws IllegalArgumentException {
if((slot < 0) || (slot >= MAX_SLOT)) {
@@ -144,6 +149,10 @@
}
}
+ if (b.mShader != null) {
+ rs.nProgramFragmentSetShader(b.mShader);
+ }
+
int id = rs.nProgramFragmentCreate();
return new ProgramFragment(id, rs);
}