diff options
| author | Jason Sams <jsams@google.com> | 2014-04-01 00:15:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 00:15:26 +0000 |
| commit | c796ccaafb935592b98d5aaad2594791935f6530 (patch) | |
| tree | 16ffc01253fecd64e8586e66028462173d019ba7 /rs/java | |
| parent | 7471a3b1ea3b722168ed3e932d4015750c913c0b (diff) | |
| parent | 095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b (diff) | |
| download | frameworks_base-c796ccaafb935592b98d5aaad2594791935f6530.zip frameworks_base-c796ccaafb935592b98d5aaad2594791935f6530.tar.gz frameworks_base-c796ccaafb935592b98d5aaad2594791935f6530.tar.bz2 | |
am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"
* commit '095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b':
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); } /** |