diff options
author | Jason Sams <jsams@google.com> | 2014-04-01 00:24:57 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 00:24:57 +0000 |
commit | afec430ada65936a4bb9143ec82c4c0429032fed (patch) | |
tree | b8c2afd4fc4990ae571c18a27396d39028ad3bd9 /rs/java | |
parent | 0ba2de8530a5006538154fb5151081c60afef52d (diff) | |
parent | c796ccaafb935592b98d5aaad2594791935f6530 (diff) | |
download | frameworks_base-afec430ada65936a4bb9143ec82c4c0429032fed.zip frameworks_base-afec430ada65936a4bb9143ec82c4c0429032fed.tar.gz frameworks_base-afec430ada65936a4bb9143ec82c4c0429032fed.tar.bz2 |
am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
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 714e835..6178994 100644 --- a/rs/java/android/renderscript/RenderScriptGL.java +++ b/rs/java/android/renderscript/RenderScriptGL.java @@ -225,9 +225,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); } /** |