commit afec430ada65936a4bb9143ec82c4c0429032fed
author Jason Sams <jsams@google.com> Tue Apr 01 00:24:57 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 01 00:24:57 2014 +0000
tree b8c2afd4fc4990ae571c18a27396d39028ad3bd9
parent 0ba2de8530a5006538154fb5151081c60afef52d
parent c796ccaafb935592b98d5aaad2594791935f6530

am c796ccaa: am 095ece10: am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit 'c796ccaafb935592b98d5aaad2594791935f6530':
  Fix RenderScriptGL setSurfaceTexture problem

rs/java/android/renderscript/RenderScriptGL.java

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 @@
         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);
     }
 
     /**