diff options
author | Miao Wang <miaowang@google.com> | 2015-03-23 21:15:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 21:15:35 +0000 |
commit | 6f6f44b0387c88b35d9345775a9e909ad484fe68 (patch) | |
tree | dc03ff4617ecb6e7f2e694354f03270b9f63bbf7 /rs/java/android/renderscript/RenderScript.java | |
parent | 09ebc52a851d3432087a622a9372a071a1c0c761 (diff) | |
parent | b2b0c4c2072459612c6ed078d84b189cba326de1 (diff) |
am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
* commit 'b2b0c4c2072459612c6ed078d84b189cba326de1':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r-- | rs/java/android/renderscript/RenderScript.java | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 50782241a446..45f0ca61ff80 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1352,7 +1352,7 @@ public class RenderScript { } /** - * calls create(cts, ContextType.NORMAL, CREATE_FLAG_NONE) + * calls create(ctx, ContextType.NORMAL, CREATE_FLAG_NONE) * * See documentation for @create for details * @@ -1364,7 +1364,7 @@ public class RenderScript { } /** - * calls create(cts, ct, CREATE_FLAG_NONE) + * calls create(ctx, ct, CREATE_FLAG_NONE) * * See documentation for @create for details * @@ -1376,7 +1376,8 @@ public class RenderScript { return create(ctx, ct, CREATE_FLAG_NONE); } - /** + + /** * Gets or creates a RenderScript context of the specified type. * * The returned context will be cached for future reuse within @@ -1398,21 +1399,49 @@ public class RenderScript { */ public static RenderScript create(Context ctx, ContextType ct, int flags) { int v = ctx.getApplicationInfo().targetSdkVersion; - if (v < 23) { - return internalCreate(ctx, v, ct, flags); + return create(ctx, v, ct, flags); + } + + /** + * calls create(ctx, sdkVersion, ContextType.NORMAL, CREATE_FLAG_NONE) + * + * Used by the RenderScriptThunker to maintain backward compatibility. + * + * @hide + * @param ctx The context. + * @param sdkVersion The target SDK Version. + * @return RenderScript + */ + public static RenderScript create(Context ctx, int sdkVersion) { + return create(ctx, sdkVersion, ContextType.NORMAL, CREATE_FLAG_NONE); + } + + /** + * Gets or creates a RenderScript context of the specified type. + * + * @hide + * @param ctx The context. + * @param ct The type of context to be created. + * @param sdkVersion The target SDK Version. + * @param flags The OR of the CREATE_FLAG_* options desired + * @return RenderScript + */ + public static RenderScript create(Context ctx, int sdkVersion, ContextType ct, int flags) { + if (sdkVersion < 23) { + return internalCreate(ctx, sdkVersion, ct, flags); } synchronized (mProcessContextList) { for (RenderScript prs : mProcessContextList) { if ((prs.mContextType == ct) && (prs.mContextFlags == flags) && - (prs.mContextSdkVersion == v)) { + (prs.mContextSdkVersion == sdkVersion)) { return prs; } } - RenderScript prs = internalCreate(ctx, v, ct, flags); + RenderScript prs = internalCreate(ctx, sdkVersion, ct, flags); prs.mIsProcessContext = true; mProcessContextList.add(prs); return prs; |