Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22186 into eclair

Browse Source 
* changes:
  Allow null to be re-bound as a root script.  This was always legal from native and just a limitation of the java binding for the API.
This commit is contained in:
Android (Google) Code Review
2009-08-20 17:24:52 -07:00
parent 9468f8006d d8e4161f11
commit 41ceb907b5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/renderscript/RenderScript.java
View File

@@ -281,7 +281,11 @@ public class RenderScript {
// Root state // Root state
public void contextBindRootScript(Script s) { public void contextBindRootScript(Script s) {
nContextBindRootScript(s.mID); int id = 0;
if(s != null) {
id = s.mID;
}
nContextBindRootScript(id);
} }
//public void contextBindSampler(Sampler s, int slot) { //public void contextBindSampler(Sampler s, int slot) {