From 65094e9ca18c3ff193378d5379ffdb7a76f4193f Mon Sep 17 00:00:00 2001 From: shadowislord Date: Thu, 5 Jun 2014 23:28:28 -0400 Subject: [PATCH] * Put the shader compile log on the next line so its slightly more readable --- .../com/jme3/renderer/android/OGLESShaderRenderer.java | 8 ++++---- .../java/com/jme3/renderer/ios/IGLESShaderRenderer.java | 8 ++++---- .../main/java/com/jme3/renderer/jogl/JoglRenderer.java | 6 +++--- .../main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java index 919c9dd03..d7a6eb017 100644 --- a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java +++ b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java @@ -892,9 +892,9 @@ public class OGLESShaderRenderer implements Renderer { logger.log(Level.WARNING, "Bad compile of:\n{0}", new Object[]{ShaderDebug.formatShaderSource(source.getDefines(), source.getSource(),stringBuf.toString())}); if (infoLog != null) { - throw new RendererException("compile error in:" + source + " error:" + infoLog); + throw new RendererException("compile error in: " + source + "\n" + infoLog); } else { - throw new RendererException("compile error in:" + source + " error: "); + throw new RendererException("compile error in: " + source + "\nerror: "); } } } @@ -963,9 +963,9 @@ public class OGLESShaderRenderer implements Renderer { } } else { if (infoLog != null) { - throw new RendererException("Shader link failure, shader:" + shader + " info:" + infoLog); + throw new RendererException("Shader link failure, shader: " + shader + "\n" + infoLog); } else { - throw new RendererException("Shader link failure, shader:" + shader + " info: "); + throw new RendererException("Shader link failure, shader: " + shader + "\ninfo: "); } } } diff --git a/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java b/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java index d9bad5e32..5cdbcb4f9 100644 --- a/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java +++ b/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java @@ -1504,9 +1504,9 @@ public class IGLESShaderRenderer implements Renderer { } } else { if (infoLog != null) { - throw new RendererException("Shader link failure, shader:" + shader + " info:" + infoLog); + throw new RendererException("Shader link failure, shader:" + shader + "\n" + infoLog); } else { - throw new RendererException("Shader link failure, shader:" + shader + " info: "); + throw new RendererException("Shader link failure, shader:" + shader + "\ninfo: "); } } } @@ -2529,9 +2529,9 @@ public class IGLESShaderRenderer implements Renderer { logger.log(Level.WARNING, "Bad compile of:\n{0}", new Object[]{ShaderDebug.formatShaderSource(source.getDefines(), source.getSource(),stringBuf.toString())}); if (infoLog != null) { - throw new RendererException("compile error in:" + source + " error:" + infoLog); + throw new RendererException("compile error in: " + source + "\n" + infoLog); } else { - throw new RendererException("compile error in:" + source + " error: "); + throw new RendererException("compile error in: " + source + "\nerror: "); } } } diff --git a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java index 363711033..95e2da55b 100644 --- a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java +++ b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java @@ -1089,9 +1089,9 @@ public class JoglRenderer implements Renderer { logger.log(Level.WARNING, "Bad compile of:\n{0}", new Object[]{ShaderDebug.formatShaderSource(source.getDefines(), source.getSource(), stringBuf.toString())}); if (infoLog != null) { - throw new RendererException("compile error in:" + source + " error:" + infoLog); + throw new RendererException("compile error in: " + source + "\n" + infoLog); } else { - throw new RendererException("compile error in:" + source + " error: "); + throw new RendererException("compile error in: " + source + "\nerror: "); } } } @@ -1167,7 +1167,7 @@ public class JoglRenderer implements Renderer { } } else { if (infoLog != null) { - throw new RendererException("Shader link failure, shader:" + shader + " info:" + infoLog); + throw new RendererException("Shader link failure, shader:" + shader + "\n" + infoLog); } else { throw new RendererException("Shader link failure, shader:" + shader + " info: "); } diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java index 5c75d9234..b30e76e2b 100644 --- a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java +++ b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java @@ -1040,9 +1040,9 @@ public class LwjglRenderer implements Renderer { logger.log(Level.WARNING, "Bad compile of:\n{0}", new Object[]{ShaderDebug.formatShaderSource(source.getDefines(), source.getSource(), stringBuf.toString())}); if (infoLog != null) { - throw new RendererException("compile error in:" + source + " error:" + infoLog); + throw new RendererException("compile error in: " + source + "\n" + infoLog); } else { - throw new RendererException("compile error in:" + source + " error: "); + throw new RendererException("compile error in: " + source + "\nerror: "); } } } @@ -1117,9 +1117,9 @@ public class LwjglRenderer implements Renderer { } } else { if (infoLog != null) { - throw new RendererException("Shader failure to link, shader:" + shader + " info:" + infoLog); + throw new RendererException("Shader failed to link, shader:" + shader + "\n" + infoLog); } else { - throw new RendererException("Shader failure to link, shader:" + shader + " info: "); + throw new RendererException("Shader failed to link, shader:" + shader + "\ninfo: "); } } }