diff options
| author | Jason Sams <jsams@google.com> | 2015-02-09 23:07:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-09 23:07:36 +0000 |
| commit | 6e0ad25ca8def88a48c9cc6436b12da7ff4600c2 (patch) | |
| tree | bcf8ab39d01b1764ed5813a04570cd6e31a16e87 /rs/java/android/renderscript/Allocation.java | |
| parent | 86b9cc30099cf0836484a5231686cb1d85ebfdca (diff) | |
| parent | 2a3cdf57a47140dfa17114338f83e0bb90054ed1 (diff) | |
am 2a3cdf57: Merge "Implement array types"
* commit '2a3cdf57a47140dfa17114338f83e0bb90054ed1':
Implement array types
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 69103e872654..9fe30aed12cb 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -58,15 +58,13 @@ public class Allocation extends BaseObj { Allocation mAdaptedAllocation; int mSize; - boolean mConstrainedLOD; - boolean mConstrainedFace; - boolean mConstrainedY; - boolean mConstrainedZ; boolean mReadAllowed = true; boolean mWriteAllowed = true; + int mSelectedX; int mSelectedY; int mSelectedZ; int mSelectedLOD; + int mSelectedArray[]; Type.CubemapFace mSelectedFace = Type.CubemapFace.POSITIVE_X; int mCurrentDimX; |