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

am 3fb6feac: Merge "Check that bound allocations are 1D"

Browse Source 
* commit '3fb6feacc62e1021c705b53d46e915ecf50582d2':
  Check that bound allocations are 1D
This commit is contained in:
Tim Murray
2014-02-03 14:41:39 -08:00
committed by Android Git Automerger
parent 67d9e0be8e 3fb6feacc6
commit b1bec0d916
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rs/java/android/renderscript/Script.java
View File

@@ -188,6 +188,13 @@ public class Script extends BaseObj {
public void bindAllocation(Allocation va, int slot) { public void bindAllocation(Allocation va, int slot) {
mRS.validate(); mRS.validate();
if (va != null) { if (va != null) {
if (mRS.getApplicationContext().getApplicationInfo().targetSdkVersion >= 20) {
final Type t = va.mType;
if (t.hasMipmaps() || t.hasFaces() || (t.getY() != 0) || (t.getZ() != 0)) {
throw new RSIllegalArgumentException(
"API 20+ only allows simple 1D allocations to be used with bind.");
}
}
mRS.nScriptBindAllocation(getID(mRS), va.getID(mRS), slot); mRS.nScriptBindAllocation(getID(mRS), va.getID(mRS), slot);
} else { } else {
mRS.nScriptBindAllocation(getID(mRS), 0, slot); mRS.nScriptBindAllocation(getID(mRS), 0, slot);