OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25ffcdc
)
Allow null to be re-bound as a root script. This was always legal from native and...
author
Jason Sams
<rjsams@android.com>
Fri, 21 Aug 2009 00:22:40 +0000
(17:22 -0700)
committer
Jason Sams
<rjsams@android.com>
Fri, 21 Aug 2009 00:22:40 +0000
(17:22 -0700)
graphics/java/android/renderscript/RenderScript.java
patch
|
blob
|
history
diff --git
a/graphics/java/android/renderscript/RenderScript.java
b/graphics/java/android/renderscript/RenderScript.java
index
076a5d4
..
1bdabe7
100644
(file)
--- a/
graphics/java/android/renderscript/RenderScript.java
+++ b/
graphics/java/android/renderscript/RenderScript.java
@@
-281,7
+281,11
@@
public class RenderScript {
// Root state
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) {