diff options
| author | Jason Sams <jsams@google.com> | 2015-02-10 01:44:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-10 01:44:11 +0000 |
| commit | ec10f833b4276cef130a26d5e4d30935dcd3ef35 (patch) | |
| tree | 17479ba05607d1b3bab765316a0defec81bb5a7b /rs/java/android/renderscript/Allocation.java | |
| parent | 04bd52d77cd489898555e6c529e7fade7f33bd6d (diff) | |
| parent | 6e0ad25ca8def88a48c9cc6436b12da7ff4600c2 (diff) | |
am 2a3cdf57: Merge "Implement array types"
automerge: 6e0ad25
* commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2':
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 e979a1bed7a7..4af66887dba6 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; |