diff options
| author | Jason Sams <jsams@google.com> | 2014-03-31 23:21:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-31 23:21:42 +0000 |
| commit | b3cafa56205942343930e4fbb0a3d50d6e33a046 (patch) | |
| tree | 38c9246c1744a6a442ee9765bd72005684f16f6c | |
| parent | 3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96 (diff) | |
| parent | 21e0af987d7baccd5417a2f744d2dd706d85604e (diff) | |
| download | frameworks_base-b3cafa56205942343930e4fbb0a3d50d6e33a046.zip frameworks_base-b3cafa56205942343930e4fbb0a3d50d6e33a046.tar.gz frameworks_base-b3cafa56205942343930e4fbb0a3d50d6e33a046.tar.bz2 | |
Merge "Fix RenderScriptGL setSurfaceTexture problem"
| -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); } /** |