diff options
| author | Jason Sams <jsams@google.com> | 2014-04-01 00:10:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 00:10:55 +0000 |
| commit | 095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b (patch) | |
| tree | 1b2ed4f30cb00de31f7133c5f5f81951d1df7638 /rs/java | |
| parent | e531e2ec6b311c35b077cc228e832b3f1530dffa (diff) | |
| parent | b3cafa56205942343930e4fbb0a3d50d6e33a046 (diff) | |
| download | frameworks_base-095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b.zip frameworks_base-095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b.tar.gz frameworks_base-095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b.tar.bz2 | |
am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
Fix RenderScriptGL setSurfaceTexture problem
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/RenderScriptGL.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/RenderScriptGL.java b/rs/java/android/renderscript/RenderScriptGL.java index c9cbe3e..d6841c8 100644 --- a/rs/java/android/renderscript/RenderScriptGL.java +++ b/rs/java/android/renderscript/RenderScriptGL.java @@ -232,9 +232,13 @@ public class RenderScriptGL extends RenderScript { validate(); //android.util.Log.v("rs", "set surface " + sur + " w=" + w + ", h=" + h); + Surface s = null; + if (sur != null) { + s = new Surface(sur); + } mWidth = w; mHeight = h; - nContextSetSurfaceTexture(w, h, sur); + nContextSetSurface(w, h, s); } /** |