Merge "Fix RenderScriptGL setSurfaceTexture problem"

2014-03-31 23:21:42 +00:00
parent 3b2a9d2279 21e0af987d
commit b3cafa5620
1 changed files with 5 additions and 1 deletions
--- 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);
    }

    /**