diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java index 0a5bd199f..375957693 100644 --- a/core/src/processing/opengl/PGL.java +++ b/core/src/processing/opengl/PGL.java @@ -1689,8 +1689,6 @@ public abstract class PGL { fragSrc[0] = "#version " + version; fragSrc[1] = "out vec4 fragColor;"; - PApplet.printArray(fragSrc); - return fragSrc; } return fragSrc0; @@ -1716,8 +1714,6 @@ public abstract class PGL { String[] vertSrc = preprocessShaderSource(vertSrc0, search, replace, 1); vertSrc[0] = "#version " + version; - PApplet.printArray(vertSrc); - return vertSrc; } return vertSrc0; diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java index f68230bb9..29651057b 100644 --- a/core/src/processing/opengl/PJOGL.java +++ b/core/src/processing/opengl/PJOGL.java @@ -1240,7 +1240,7 @@ public class PJOGL extends PGL { @Override protected String[] loadVertexShader(String filename, int version) { - if (PApplet.platform == PConstants.WINDOWS) { + if (PApplet.platform == PConstants.MACOSX) { String[] fragSrc0 = pg.parent.loadStrings(filename); return preprocessFragmentSource(fragSrc0, 130); } else { @@ -1251,7 +1251,7 @@ public class PJOGL extends PGL { @Override protected String[] loadFragmentShader(String filename, int version) { - if (PApplet.platform == PConstants.WINDOWS) { + if (PApplet.platform == PConstants.MACOSX) { String[] vertSrc0 = pg.parent.loadStrings(filename); return preprocessVertexSource(vertSrc0, 130); } else { @@ -1263,7 +1263,7 @@ public class PJOGL extends PGL { @Override protected String[] loadFragmentShader(URL url, int version) { try { - if (PApplet.platform == PConstants.WINDOWS) { + if (PApplet.platform == PConstants.MACOSX) { String[] fragSrc0 = PApplet.loadStrings(url.openStream()); return preprocessFragmentSource(fragSrc0, 130); } else { @@ -1279,7 +1279,7 @@ public class PJOGL extends PGL { @Override protected String[] loadVertexShader(URL url, int version) { try { - if (PApplet.platform == PConstants.WINDOWS) { + if (PApplet.platform == PConstants.MACOSX) { String[] vertSrc0 = PApplet.loadStrings(url.openStream()); return preprocessVertexSource(vertSrc0, 130); } else {