diff options
| author | Yang Ni <yangni@google.com> | 2016-04-05 00:50:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-05 00:50:42 +0000 |
| commit | 14182697bbaeee70fd78bd12e8e7d87254415eae (patch) | |
| tree | ee4e3932b0fc02b5adacdf21b9da971b532144a3 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 31da1779e70b9a39c16d2bcc2c3cbb34785cb13b (diff) | |
| parent | 4a70df58a32591429ec04902deac2b2210fb96c3 (diff) | |
Merge "Avoid destroying Device separately" into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScriptGL.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/RenderScriptGL.java b/rs/java/android/renderscript/RenderScriptGL.java index 6178994cfbe3..be1f899bd08b 100644 --- a/rs/java/android/renderscript/RenderScriptGL.java +++ b/rs/java/android/renderscript/RenderScriptGL.java @@ -177,9 +177,9 @@ public class RenderScriptGL extends RenderScript { mWidth = 0; mHeight = 0; - mDev = nDeviceCreate(); + long device = nDeviceCreate(); int dpi = ctx.getResources().getDisplayMetrics().densityDpi; - mContext = nContextCreateGL(mDev, 0, sdkVersion, + mContext = nContextCreateGL(device, 0, sdkVersion, mSurfaceConfig.mColorMin, mSurfaceConfig.mColorPref, mSurfaceConfig.mAlphaMin, mSurfaceConfig.mAlphaPref, mSurfaceConfig.mDepthMin, mSurfaceConfig.mDepthPref, |