diff options
| author | Yang Ni <yangni@google.com> | 2016-04-05 00:55:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 00:55:37 +0000 |
| commit | af2ac8e2bc8bb5257380396e4768a0aa7f47fa0b (patch) | |
| tree | 274432fb956cf60e074cf3e8a0e33341ac72d992 | |
| parent | 4301e5c928d24fedce4816f6a8170e4b088b17a3 (diff) | |
| parent | 14182697bbaeee70fd78bd12e8e7d87254415eae (diff) | |
Merge "Avoid destroying Device separately" into nyc-dev
am: 1418269
* commit '14182697bbaeee70fd78bd12e8e7d87254415eae':
Avoid destroying Device separately
Change-Id: Iecd5d3b1288dfab8a3713b8b54180e6e6d0de3d8
| -rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 8 | ||||
| -rw-r--r-- | rs/java/android/renderscript/RenderScriptGL.java | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 9beaba301072..2650e5a868d2 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1031,7 +1031,6 @@ public class RenderScript { - long mDev; long mContext; private boolean mDestroyed = false; @@ -1426,8 +1425,8 @@ public class RenderScript { RenderScript rs = new RenderScript(ctx); - rs.mDev = rs.nDeviceCreate(); - rs.mContext = rs.nContextCreate(rs.mDev, flags, sdkVersion, ct.mID); + long device = rs.nDeviceCreate(); + rs.mContext = rs.nContextCreate(device, flags, sdkVersion, ct.mID); rs.mContextType = ct; rs.mContextFlags = flags; rs.mContextSdkVersion = sdkVersion; @@ -1635,9 +1634,6 @@ public class RenderScript { } nContextDestroy(); - - nDeviceDestroy(mDev); - mDev = 0; } } 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, |