diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2012-01-30 14:24:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-30 14:24:04 -0800 |
| commit | 0982edb701c1c4b5ef190992d19adf722e1db769 (patch) | |
| tree | d68875a1bce728674fbb52af13f955cf6d6a8ff8 | |
| parent | 7895a7fa72ce75b9cb64df3287692573267b841c (diff) | |
| parent | 5de922962a2fa06267f3ad26f75e3a8083af906c (diff) | |
| download | frameworks_base-0982edb701c1c4b5ef190992d19adf722e1db769.zip frameworks_base-0982edb701c1c4b5ef190992d19adf722e1db769.tar.gz frameworks_base-0982edb701c1c4b5ef190992d19adf722e1db769.tar.bz2 | |
Merge "Fixing possible pne." into graphics-dev
| -rw-r--r-- | tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java | 7 | ||||
| -rw-r--r-- | tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Renderable.java | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java index 0fb32ff..ca03263 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java @@ -19,6 +19,8 @@ package com.android.scenegraph; import java.lang.Math; import java.util.ArrayList; +import com.android.scenegraph.TextureBase; + import android.content.res.Resources; import android.renderscript.*; import android.renderscript.ProgramFragment.Builder; @@ -102,7 +104,10 @@ public class FragmentShader extends Shader { ShaderParam sp = mSourceParams.get(mShaderTextureNames.get(i)); if (sp != null && sp instanceof TextureParam) { TextureParam p = (TextureParam)sp; - mProgram.bindTexture(p.getTexture().getRsData(), shaderTextureStart + i); + TextureBase tex = p.getTexture(); + if (tex != null) { + mProgram.bindTexture(tex.getRsData(), shaderTextureStart + i); + } } } } diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Renderable.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Renderable.java index 445c590..eaf36fe 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Renderable.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Renderable.java @@ -138,7 +138,10 @@ public class Renderable extends RenderableBase { ShaderParam sp = allParamsIter.next(); if (sp instanceof TextureParam) { TextureParam p = (TextureParam)sp; - mRsFieldItem.pf_textures[paramIndex++] = p.getTexture().getRsData(); + TextureBase tex = p.getTexture(); + if (tex != null) { + mRsFieldItem.pf_textures[paramIndex++] = tex.getRsData(); + } } } ProgramFragment pf = mRenderState.mFragment.mProgram; |