From 6cf158cc59e901b49ab54681e363d23492421a9d Mon Sep 17 00:00:00 2001 From: Sven Göthel Date: Mon, 22 Jan 2024 06:44:41 +0100 Subject: Bug 1488 - Graph RegionRenderer: Ensure shaderPrograms1 path is disabled using 'static final boolean useShaderPrograms0 = true' For now, let's leave the dead shaderPrograms1 code path inside the class for further consideration. --- .../com/jogamp/graph/curve/opengl/RegionRenderer.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/jogl/classes') diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java index df8be39d2..8dd72d231 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java @@ -282,11 +282,13 @@ public final class RegionRenderer { } shaderPrograms0.clear(); - for(final Iterator i = shaderPrograms1.values().iterator(); i.hasNext(); ) { - final ShaderProgram sp = i.next(); - sp.destroy(gl); + if( !useShaderPrograms0 ) { + for(final Iterator i = shaderPrograms1.values().iterator(); i.hasNext(); ) { + final ShaderProgram sp = i.next(); + sp.destroy(gl); + } + shaderPrograms1.clear(); } - shaderPrograms1.clear(); rs.detachFrom(gl); rs.destroy(); initialized = false; @@ -582,8 +584,8 @@ public final class RegionRenderer { } } private final IntObjectHashMap shaderPrograms0 = new IntObjectHashMap(); - private final HashMap shaderPrograms1 = new HashMap(); - private final boolean useShaderPrograms0 = true; + private final HashMap shaderPrograms1 = null; // new HashMap(); + private static final boolean useShaderPrograms0 = true; private static String shaderKeyToString(final int hashCode, final boolean isTwoPass, final boolean pass1, final boolean hasFrustumClipping, final boolean hasColorChannel, final boolean hasColorTexture, -- cgit v1.2.3