From 5de922962a2fa06267f3ad26f75e3a8083af906c Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Mon, 30 Jan 2012 14:05:39 -0800 Subject: Fixing possible pne. Change-Id: I4a8071374a72c0ca2639dc033d06d17e0a0466f7 --- .../SceneGraph/src/com/android/scenegraph/FragmentShader.java | 7 ++++++- .../SceneGraph/src/com/android/scenegraph/Renderable.java | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'tests/RenderScriptTests/SceneGraph') diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/FragmentShader.java index 0fb32ff76774..ca0326355afa 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 445c590fb1f5..eaf36fe317ec 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; -- cgit v1.2.3-59-g8ed1b