Add Collapsible Code Blocks by ethaniel0 · Pull Request #5622 · processing/processing

Expand Up @@ -509,50 +509,59 @@ protected int getGLSLVersion() { return vn.getMajor() * 100 + vn.getMinor(); }
protected String getGLSLVersionSuffix() { VersionNumber vn = context.getGLSLVersionNumber(); if (context.isGLESProfile() && 1 < vn.getMajor()) { return " es"; } else { return ""; } }

@Override protected String[] loadVertexShader(String filename) { return loadVertexShader(filename, getGLSLVersion()); return loadVertexShader(filename, getGLSLVersion(), getGLSLVersionSuffix()); }

@Override protected String[] loadFragmentShader(String filename) { return loadFragmentShader(filename, getGLSLVersion()); return loadFragmentShader(filename, getGLSLVersion(), getGLSLVersionSuffix()); }

@Override protected String[] loadVertexShader(URL url) { return loadVertexShader(url, getGLSLVersion()); return loadVertexShader(url, getGLSLVersion(), getGLSLVersionSuffix()); }

@Override protected String[] loadFragmentShader(URL url) { return loadFragmentShader(url, getGLSLVersion()); return loadFragmentShader(url, getGLSLVersion(), getGLSLVersionSuffix()); }

@Override protected String[] loadFragmentShader(String filename, int version) { protected String[] loadFragmentShader(String filename, int version, String versionSuffix) { String[] fragSrc0 = sketch.loadStrings(filename); return preprocessFragmentSource(fragSrc0, version); return preprocessFragmentSource(fragSrc0, version, versionSuffix); }

@Override protected String[] loadVertexShader(String filename, int version) { protected String[] loadVertexShader(String filename, int version, String versionSuffix) { String[] vertSrc0 = sketch.loadStrings(filename); return preprocessVertexSource(vertSrc0, version); return preprocessVertexSource(vertSrc0, version, versionSuffix); }

@Override protected String[] loadFragmentShader(URL url, int version) { protected String[] loadFragmentShader(URL url, int version, String versionSuffix) { try { String[] fragSrc0 = PApplet.loadStrings(url.openStream()); return preprocessFragmentSource(fragSrc0, version); return preprocessFragmentSource(fragSrc0, version, versionSuffix); } catch (IOException e) { PGraphics.showException("Cannot load fragment shader " + url.getFile()); } Expand All @@ -561,10 +570,10 @@ protected String[] loadFragmentShader(URL url, int version) {

@Override protected String[] loadVertexShader(URL url, int version) { protected String[] loadVertexShader(URL url, int version, String versionSuffix) { try { String[] vertSrc0 = PApplet.loadStrings(url.openStream()); return preprocessVertexSource(vertSrc0, version); return preprocessVertexSource(vertSrc0, version, versionSuffix); } catch (IOException e) { PGraphics.showException("Cannot load vertex shader " + url.getFile()); } Expand Down Expand Up @@ -1926,6 +1935,8 @@ public void blitFramebuffer(int srcX0, int srcY0, int srcX1, int srcY1, int dstX gl2x.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } else if (gl3 != null) { gl3.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } else if (gl3es3 != null) { gl3es3.glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } else { throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glBlitFramebuffer()")); } Expand All @@ -1937,6 +1948,8 @@ public void renderbufferStorageMultisample(int target, int samples, int format, gl2x.glRenderbufferStorageMultisample(target, samples, format, width, height); } else if (gl3 != null) { gl3.glRenderbufferStorageMultisample(target, samples, format, width, height); } else if (gl3es3 != null) { gl3es3.glRenderbufferStorageMultisample(target, samples, format, width, height); } else { throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glRenderbufferStorageMultisample()")); } Expand All @@ -1948,6 +1961,8 @@ public void readBuffer(int buf) { gl2x.glReadBuffer(buf); } else if (gl3 != null) { gl3.glReadBuffer(buf); } else if (gl3es3 != null) { gl3es3.glReadBuffer(buf); } else { throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glReadBuffer()")); } Expand All @@ -1959,6 +1974,11 @@ public void drawBuffer(int buf) { gl2x.glDrawBuffer(buf); } else if (gl3 != null) { gl3.glDrawBuffer(buf); } else if (gl3es3 != null) { IntBuffer intBuffer = IntBuffer.allocate(1); intBuffer.put(buf); intBuffer.rewind(); gl3es3.glDrawBuffers(1, intBuffer); } else { throw new RuntimeException(String.format(MISSING_GLFUNC_ERROR, "glDrawBuffer()")); } Expand Down