ShaderState Switch Program: Only disable current program if no new one; Better toString formating

1 files changed, 16 insertions, 9 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
index b622571e7..e04a8c534 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderProgram.java
@@ -30,6 +30,8 @@ package com.jogamp.opengl.util.glsl;
 
 import javax.media.opengl.*;
 
+import com.jogamp.common.os.Platform;
+
 import java.util.HashSet;
 import java.util.Iterator;
 import java.io.PrintStream;
@@ -262,18 +264,23 @@ public class ShaderProgram {
         return id;
     }
 
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("ShaderProgram[id="+id);
-        buf.append(", linked="+programLinked+", inUse="+programInUse+", program: "+shaderProgram+", [");
+    public StringBuilder toString(StringBuilder sb) {
+        if(null == sb) {
+            sb = new StringBuilder();
+        }
+        sb.append("ShaderProgram[id=").append(id);
+        sb.append(", linked="+programLinked+", inUse="+programInUse+", program: "+shaderProgram+",");
         for(Iterator<ShaderCode> iter=allShaderCode.iterator(); iter.hasNext(); ) {
-            buf.append(iter.next());
-            buf.append(" ");
+            sb.append(Platform.getNewline()).append("   ").append(iter.next());
         }
-        buf.append("]");
-        return buf.toString();
+        sb.append("]");
+        return sb;
     }
-
+        
+    public String toString() {
+        return toString(null).toString();
+    }
+    
     protected synchronized void useProgram(GL2ES2 gl, boolean on) {
         if(!programLinked) throw new GLException("Program is not linked");
         if(programInUse==on) return;