am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

* commit 'b3cafa56205942343930e4fbb0a3d50d6e33a046':
  Fix RenderScriptGL setSurfaceTexture problem
This commit is contained in:
Jason Sams
2014-04-01 00:10:55 +00:00
committed by Android Git Automerger

View File

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