sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed shader error output. the shader source code was appended twice in the log.

Browse Source
This commit is contained in:
Nehon 2015-02-12 22:43:03 +01:00
parent 5b6b33c8f5
commit 53a40c887e
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View File

@ -1096,7 +1096,7 @@ public class GLRenderer implements Renderer {
source.clearUpdateNeeded(); source.clearUpdateNeeded();
} else { } else {
logger.log(Level.WARNING, "Bad compile of:\n{0}", logger.log(Level.WARNING, "Bad compile of:\n{0}",
new Object[]{ShaderDebug.formatShaderSource(source.getDefines(), source.getSource(), stringBuf.toString())}); new Object[]{ShaderDebug.formatShaderSource(stringBuf.toString())});
if (infoLog != null) { if (infoLog != null) {
throw new RendererException("compile error in: " + source + "\n" + infoLog); throw new RendererException("compile error in: " + source + "\n" + infoLog);
} else { } else {

19
jme3-core/src/tools/java/jme3tools/shader/ShaderDebug.java
View File

@ -39,28 +39,13 @@ public class ShaderDebug {
/** /**
* Append the line numbers to the source code of a shader to output it * Append the line numbers to the source code of a shader to output it
* @param defines the defines
* @param source the source * @param source the source
* @return the formated source code * @return the formated source code
*/ */
public static String formatShaderSource(String defines, String source, String version) { public static String formatShaderSource(String source) {
String[] versionLines = version.split("\n");
String[] definesLines = defines.split("\n");
String[] sourceLines = source.split("\n"); String[] sourceLines = source.split("\n");
int nblines = 0; int nblines = 0;
StringBuilder out = new StringBuilder(); StringBuilder out = new StringBuilder();
if (!version.equals("")) {
for (String string : versionLines) {
nblines++;
out.append(nblines).append("\t").append(string).append("\n");
}
}
if (!defines.equals("")) {
for (String string : definesLines) {
nblines++;
out.append(nblines).append("\t").append(string).append("\n");
}
}
for (String string : sourceLines) { for (String string : sourceLines) {
nblines++; nblines++;
out.append(nblines).append("\t").append(string).append("\n"); out.append(nblines).append("\t").append(string).append("\n");