drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Piping texture names through shader builder.

Browse Source 
Fixing uint size_t mismatch.

Change-Id: Ia7c8bd9f829deaa50e1cc381ccd50f29676bbdfb
This commit is contained in:
Alex Sakhartchouk
2012-02-15 16:21:46 -08:00
parent a3f154324a
commit 2123b46ba8
21 changed files with 443 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/renderscript/ProgramVertexFixedFunction.java
View File

@ -70,6 +70,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
public ProgramVertexFixedFunction create() {
mRS.validate();
int[] tmp = new int[(mInputCount + mOutputCount + mConstantCount + mTextureCount) * 2];
String[] texNames = new String[mTextureCount];
int idx = 0;
for (int i=0; i < mInputCount; i++) {
@ -87,9 +88,10 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
for (int i=0; i < mTextureCount; i++) {
tmp[idx++] = ProgramParam.TEXTURE_TYPE.mID;
tmp[idx++] = mTextureTypes[i].mID;
texNames[i] = mTextureNames[i];
}
int id = mRS.nProgramVertexCreate(mShader, tmp);
int id = mRS.nProgramVertexCreate(mShader, texNames, tmp);
ProgramVertexFixedFunction pv = new ProgramVertexFixedFunction(id, mRS);
initProgram(pv);
return pv;