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

Validate context when using RS objects.

Browse Source 
BUG=6035422

Change-Id: I8586be0085b36767289e1f634111c0ff076cec3c
This commit is contained in:
Jason Sams
2012-04-03 15:36:36 -07:00
parent 991c8733c3
commit e07694b24f
16 changed files with 94 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/java/android/renderscript/Program.java
View File

@@ -134,11 +134,11 @@ public class Program extends BaseObj {
throw new IllegalArgumentException("Slot ID out of range.");
}
if (a != null &&
a.getType().getID() != mConstants[slot].getID()) {
a.getType().getID(mRS) != mConstants[slot].getID(mRS)) {
throw new IllegalArgumentException("Allocation type does not match slot type.");
}
int id = a != null ? a.getID() : 0;
mRS.nProgramBindConstants(getID(), slot, id);
int id = a != null ? a.getID(mRS) : 0;
mRS.nProgramBindConstants(getID(mRS), slot, id);
}
/**
@@ -159,8 +159,8 @@ public class Program extends BaseObj {
throw new IllegalArgumentException("Cannot bind cubemap to 2d texture slot");
}
int id = va != null ? va.getID() : 0;
mRS.nProgramBindTexture(getID(), slot, id);
int id = va != null ? va.getID(mRS) : 0;
mRS.nProgramBindTexture(getID(mRS), slot, id);
}
/**
@@ -179,8 +179,8 @@ public class Program extends BaseObj {
throw new IllegalArgumentException("Slot ID out of range.");
}
int id = vs != null ? vs.getID() : 0;
mRS.nProgramBindSampler(getID(), slot, id);
int id = vs != null ? vs.getID(mRS) : 0;
mRS.nProgramBindSampler(getID(mRS), slot, id);
}