Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode.

Browse Source
This commit is contained in:
Jason Sams
2009-12-17 16:55:08 -08:00
parent 8bb41dd614
commit 68afd01ec9
12 changed files with 203 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
graphics/java/android/renderscript/ProgramFragment.java
View File

@@ -26,44 +26,10 @@ import android.util.Log;
*
**/
public class ProgramFragment extends Program {
public static final int MAX_SLOT = 2;
public enum EnvMode {
REPLACE (0),
MODULATE (1),
DECAL (2);
int mID;
EnvMode(int id) {
mID = id;
}
}
ProgramFragment(int id, RenderScript rs) {
super(id, rs);
}
public void bindTexture(Allocation va, int slot)
throws IllegalArgumentException {
mRS.validate();
if((slot < 0) || (slot >= MAX_SLOT)) {
throw new IllegalArgumentException("Slot ID out of range.");
}
mRS.nProgramFragmentBindTexture(mID, slot, va.mID);
}
public void bindSampler(Sampler vs, int slot)
throws IllegalArgumentException {
mRS.validate();
if((slot < 0) || (slot >= MAX_SLOT)) {
throw new IllegalArgumentException("Slot ID out of range.");
}
mRS.nProgramFragmentBindSampler(mID, slot, vs.mID);
}
public static class ShaderBuilder extends BaseProgramBuilder {
public ShaderBuilder(RenderScript rs) {
super(rs);
@@ -97,101 +63,77 @@ public class ProgramFragment extends Program {
}
public static class Builder {
public static final int MAX_TEXTURE = 2;
RenderScript mRS;
Element mIn;
Element mOut;
boolean mPointSpriteEnable;
String mShader;
public enum EnvMode {
REPLACE (1),
MODULATE (2),
DECAL (3);
int mID;
EnvMode(int id) {
mID = id;
}
}
public enum Format {
ALPHA (1),
LUMINANCE_ALPHA (2),
RGB (3),
RGBA (4);
int mID;
Format(int id) {
mID = id;
}
}
private class Slot {
Type mType;
EnvMode mEnv;
boolean mTexEnable;
Slot() {
mTexEnable = false;
EnvMode env;
Format format;
Slot(EnvMode _env, Format _fmt) {
env = _env;
format = _fmt;
}
}
Slot[] mSlots;
public Builder(RenderScript rs, Element in, Element out) {
public Builder(RenderScript rs) {
mRS = rs;
mIn = in;
mOut = out;
mSlots = new Slot[MAX_SLOT];
mSlots = new Slot[MAX_TEXTURE];
mPointSpriteEnable = false;
for(int ct=0; ct < MAX_SLOT; ct++) {
mSlots[ct] = new Slot();
}
}
public void setShader(String s) {
mShader = s;
}
public void setType(int slot, Type t)
public void setTexture(EnvMode env, Format fmt, int slot)
throws IllegalArgumentException {
if((slot < 0) || (slot >= MAX_SLOT)) {
throw new IllegalArgumentException("Slot ID out of range.");
if((slot < 0) || (slot >= MAX_TEXTURE)) {
throw new IllegalArgumentException("MAX_TEXTURE exceeded.");
}
mSlots[slot].mType = t;
}
public void setTexEnable(boolean enable, int slot)
throws IllegalArgumentException {
if((slot < 0) || (slot >= MAX_SLOT)) {
throw new IllegalArgumentException("Slot ID out of range.");
}
mSlots[slot].mTexEnable = enable;
}
public void setTexEnvMode(EnvMode env, int slot)
throws IllegalArgumentException {
if((slot < 0) || (slot >= MAX_SLOT)) {
throw new IllegalArgumentException("Slot ID out of range.");
}
mSlots[slot].mEnv = env;
mSlots[slot] = new Slot(env, fmt);
}
public void setPointSpriteTexCoordinateReplacement(boolean enable) {
mPointSpriteEnable = enable;
}
static synchronized ProgramFragment internalCreate(RenderScript rs, Builder b) {
int inID = 0;
int outID = 0;
if (b.mIn != null) {
inID = b.mIn.mID;
}
if (b.mOut != null) {
outID = b.mOut.mID;
}
rs.nProgramFragmentBegin(inID, outID, b.mPointSpriteEnable);
for(int ct=0; ct < MAX_SLOT; ct++) {
if(b.mSlots[ct].mTexEnable) {
Slot s = b.mSlots[ct];
int typeID = 0;
if(s.mType != null) {
typeID = s.mType.mID;
}
rs.nProgramFragmentSetSlot(ct, true, s.mEnv.mID, typeID);
}
}
if (b.mShader != null) {
rs.nProgramFragmentSetShader(b.mShader);
}
int id = rs.nProgramFragmentCreate();
return new ProgramFragment(id, rs);
}
public ProgramFragment create() {
mRS.validate();
return internalCreate(mRS, this);
int[] tmp = new int[MAX_TEXTURE * 2 + 1];
if (mSlots[0] != null) {
tmp[0] = mSlots[0].env.mID;
tmp[1] = mSlots[0].format.mID;
}
if (mSlots[1] != null) {
tmp[2] = mSlots[1].env.mID;
tmp[3] = mSlots[1].format.mID;
}
tmp[4] = mPointSpriteEnable ? 1 : 0;
int id = mRS.nProgramFragmentCreate(tmp);
ProgramFragment pf = new ProgramFragment(id, mRS);
pf.mTextureCount = MAX_TEXTURE;
return pf;
}
}
}