Beging GL2 user shaders. Switch master to using GL2 by default.

This commit is contained in:
Jason Sams
2009-11-30 14:49:55 -08:00
parent 5154ae7665
commit 54c0ec14e0
11 changed files with 109 additions and 22 deletions

View File

@@ -69,6 +69,7 @@ public class ProgramFragment extends BaseObj {
Element mIn;
Element mOut;
boolean mPointSpriteEnable;
String mShader;
private class Slot {
Type mType;
@@ -92,6 +93,10 @@ public class ProgramFragment extends BaseObj {
}
}
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 @@ public class ProgramFragment extends BaseObj {
}
}
if (b.mShader != null) {
rs.nProgramFragmentSetShader(b.mShader);
}
int id = rs.nProgramFragmentCreate();
return new ProgramFragment(id, rs);
}