aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-05-08 05:32:14 +0200
committerSven Gothel <[email protected]>2011-05-08 05:32:14 +0200
commit2c5bdd6b2810d9fd19f358d92cf63e03cefeec2d (patch)
tree08f7e8be7414d0a99fa45381cb5b75251cbbe29d /src/jogl/classes/com/jogamp/opengl
parenteefa76604706bcaa55a1a324cb4eef78dd7a030c (diff)
Graph/JOGL: Avoid NPE
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
index a5290b958..e51998a87 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -942,7 +942,13 @@ public class ShaderState {
}
sb.append("ShaderState[ ");
- sb.append(Platform.getNewline()).append(" ").append(shaderProgram.toString());
+
+ sb.append(Platform.getNewline()).append(" ");
+ if(null != shaderProgram) {
+ shaderProgram.toString(sb);
+ } else {
+ sb.append("ShaderProgram: null");
+ }
sb.append(Platform.getNewline()).append(" enabledAttributes [");
for(Iterator<String> iter = enabledAttributes.iterator(); iter.hasNext(); ) {
sb.append(Platform.getNewline()).append(" ").append(iter.next());