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

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

View File

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