Remove unused bufferutils

gephi · Jun 12, 2024 · 75fbdf2 · 75fbdf2
1 parent 17dd7a4
commit 75fbdf2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 393 deletions.
diff --git a/...pengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/arrays/ArrayDrawEdgeData.java b/...pengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/arrays/ArrayDrawEdgeData.java
@@ -7,7 +7,7 @@
 import com.jogamp.opengl.GL2ES2;
 import com.jogamp.opengl.util.GLBuffers;
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
+
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Graph;
 import org.gephi.viz.engine.VizEngine;
@@ -17,11 +17,9 @@
 import org.gephi.viz.engine.jogl.pipeline.common.AbstractEdgeData;
 import org.gephi.viz.engine.status.GraphRenderingOptions;
 import org.gephi.viz.engine.status.GraphSelection;
-import org.gephi.viz.engine.structure.GraphIndex;
 import org.gephi.viz.engine.structure.GraphIndexImpl;
 import org.gephi.viz.engine.util.ArrayUtils;
 import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
 import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 
 /**
@@ -172,8 +170,6 @@ protected void initBuffers(GL gl) {
             vertexGLBufferUndirected.bind(gl);
             vertexGLBufferUndirected.init(gl, undirectedVertexData, GLBufferMutable.GL_BUFFER_USAGE_STATIC_DRAW);
             vertexGLBufferUndirected.unbind(gl);
-
-            //BufferUtils.destroyDirectBuffer(undirectedVertexData);
         }
 
         {
@@ -188,8 +184,6 @@ protected void initBuffers(GL gl) {
             vertexGLBufferDirected.bind(gl);
             vertexGLBufferDirected.init(gl, directedVertexData, GLBufferMutable.GL_BUFFER_USAGE_STATIC_DRAW);
             vertexGLBufferDirected.unbind(gl);
-
-            //BufferUtils.destroyDirectBuffer(directedVertexData);
         }
 
         //Initialize for batch edges size:

diff --git a/...pengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/arrays/ArrayDrawNodeData.java b/...pengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/arrays/ArrayDrawNodeData.java
@@ -1,24 +1,17 @@
 package org.gephi.viz.engine.jogl.pipeline.arrays;
 
 import com.jogamp.opengl.GL;
-import static com.jogamp.opengl.GL.GL_FLOAT;
 import com.jogamp.opengl.GL2ES2;
-import com.jogamp.opengl.util.GLBuffers;
+
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import org.gephi.graph.api.Node;
+
 import org.gephi.viz.engine.VizEngine;
-import org.gephi.viz.engine.jogl.models.NodeDiskModel;
 import org.gephi.viz.engine.pipeline.RenderingLayer;
 import org.gephi.viz.engine.jogl.pipeline.common.AbstractNodeData;
-import org.gephi.viz.engine.pipeline.common.InstanceCounter;
 import org.gephi.viz.engine.status.GraphRenderingOptions;
 import org.gephi.viz.engine.status.GraphSelection;
 import org.gephi.viz.engine.structure.GraphIndexImpl;
 import static org.gephi.viz.engine.util.gl.Constants.*;
-import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
-import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 
 /**
  *

diff --git a/...opengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/common/AbstractNodeData.java b/...opengl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/common/AbstractNodeData.java
@@ -13,7 +13,6 @@
 import org.gephi.viz.engine.jogl.models.NodeDiskModel;
 import org.gephi.viz.engine.jogl.models.NodeDiskVertexDataGenerator;
 import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
 import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 import org.gephi.viz.engine.pipeline.RenderingLayer;
 import org.gephi.viz.engine.pipeline.common.InstanceCounter;
@@ -152,8 +151,6 @@ protected void initCirclesGLVertexBuffer(GL gl, final int bufferName) {
         vertexGLBuffer.bind(gl);
         vertexGLBuffer.init(gl, circleVertexBuffer, GL_BUFFER_USAGE_STATIC_DRAW);
         vertexGLBuffer.unbind(gl);
-
-        //BufferUtils.destroyDirectBuffer(circleVertexBuffer);
     }
 
     protected int setupShaderProgramForRenderingLayer(final GL2ES2 gl,

diff --git a/...engl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/indirect/IndirectNodeData.java b/...engl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/indirect/IndirectNodeData.java
@@ -1,25 +1,17 @@
 package org.gephi.viz.engine.jogl.pipeline.indirect;
 
 import com.jogamp.opengl.GL;
-import static com.jogamp.opengl.GL.GL_FLOAT;
-import static com.jogamp.opengl.GL.GL_UNSIGNED_INT;
 import com.jogamp.opengl.GL4;
-import com.jogamp.opengl.util.GLBuffers;
+
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-import org.gephi.graph.api.Node;
+
 import org.gephi.viz.engine.VizEngine;
-import org.gephi.viz.engine.jogl.models.NodeDiskModel;
 import org.gephi.viz.engine.pipeline.RenderingLayer;
 import org.gephi.viz.engine.jogl.pipeline.common.AbstractNodeData;
-import org.gephi.viz.engine.pipeline.common.InstanceCounter;
 import org.gephi.viz.engine.status.GraphRenderingOptions;
 import org.gephi.viz.engine.status.GraphSelection;
 import org.gephi.viz.engine.structure.GraphIndexImpl;
-import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
-import org.gephi.viz.engine.jogl.util.gl.GLBuffer;
-import org.gephi.viz.engine.jogl.util.gl.GLBufferImmutable;
 import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 import static org.gephi.viz.engine.util.gl.GLConstants.INDIRECT_DRAW_COMMAND_BYTES;
 import static org.gephi.viz.engine.util.gl.GLConstants.INDIRECT_DRAW_COMMAND_INTS_COUNT;

diff --git a/...gl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/instanced/InstancedEdgeData.java b/...gl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/instanced/InstancedEdgeData.java
@@ -1,12 +1,10 @@
 package org.gephi.viz.engine.jogl.pipeline.instanced;
 
 import com.jogamp.opengl.GL;
-import static com.jogamp.opengl.GL.GL_FLOAT;
-import com.jogamp.opengl.GL2ES3;
 import com.jogamp.opengl.GL3ES3;
 import com.jogamp.opengl.util.GLBuffers;
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
+
 import org.gephi.graph.api.Edge;
 import org.gephi.graph.api.Graph;
 import org.gephi.viz.engine.VizEngine;
@@ -16,10 +14,7 @@
 import org.gephi.viz.engine.jogl.pipeline.common.AbstractEdgeData;
 import org.gephi.viz.engine.status.GraphRenderingOptions;
 import org.gephi.viz.engine.status.GraphSelection;
-import org.gephi.viz.engine.structure.GraphIndex;
 import org.gephi.viz.engine.structure.GraphIndexImpl;
-import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
 import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 
 /**
@@ -81,14 +76,12 @@ protected void initBuffers(GL gl) {
         vertexGLBufferUndirected.bind(gl);
         vertexGLBufferUndirected.init(gl, undirectedVertexData, GLBufferMutable.GL_BUFFER_USAGE_STATIC_DRAW);
         vertexGLBufferUndirected.unbind(gl);
-        //BufferUtils.destroyDirectBuffer(undirectedVertexData);
 
         final FloatBuffer directedVertexData = GLBuffers.newDirectFloatBuffer(EdgeLineModelDirected.getVertexData());
         vertexGLBufferDirected = new GLBufferMutable(bufferName[VERT_BUFFER_DIRECTED], GLBufferMutable.GL_BUFFER_TYPE_ARRAY);
         vertexGLBufferDirected.bind(gl);
         vertexGLBufferDirected.init(gl, directedVertexData, GLBufferMutable.GL_BUFFER_USAGE_STATIC_DRAW);
         vertexGLBufferDirected.unbind(gl);
-        //BufferUtils.destroyDirectBuffer(directedVertexData);
 
         //Initialize for batch edges size:
         attributesGLBufferDirected = new GLBufferMutable(bufferName[ATTRIBS_BUFFER_DIRECTED], GLBufferMutable.GL_BUFFER_TYPE_ARRAY);

diff --git a/...gl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/instanced/InstancedNodeData.java b/...gl-jogl/src/main/java/org/gephi/viz/engine/jogl/pipeline/instanced/InstancedNodeData.java
@@ -1,29 +1,16 @@
 package org.gephi.viz.engine.jogl.pipeline.instanced;
 
 import com.jogamp.opengl.GL;
-import static com.jogamp.opengl.GL.GL_FLOAT;
 import com.jogamp.opengl.GL2ES3;
-import com.jogamp.opengl.GL3ES3;
-import com.jogamp.opengl.util.GLBuffers;
+
 import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
 
-import org.gephi.graph.api.Edge;
-import org.gephi.graph.api.Graph;
-import org.gephi.graph.api.Node;
 import org.gephi.viz.engine.VizEngine;
-import org.gephi.viz.engine.jogl.models.EdgeLineModelDirected;
-import org.gephi.viz.engine.jogl.models.EdgeLineModelUndirected;
-import org.gephi.viz.engine.jogl.models.NodeDiskModel;
-import org.gephi.viz.engine.jogl.pipeline.common.AbstractEdgeData;
 import org.gephi.viz.engine.pipeline.RenderingLayer;
 import org.gephi.viz.engine.jogl.pipeline.common.AbstractNodeData;
-import org.gephi.viz.engine.pipeline.common.InstanceCounter;
 import org.gephi.viz.engine.status.GraphRenderingOptions;
 import org.gephi.viz.engine.status.GraphSelection;
 import org.gephi.viz.engine.structure.GraphIndexImpl;
-import org.gephi.viz.engine.jogl.util.ManagedDirectBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
 import org.gephi.viz.engine.jogl.util.gl.GLBufferMutable;
 
 /**

diff --git a/modules/opengl-jogl/src/main/java/org/gephi/viz/engine/jogl/util/ManagedDirectBuffer.java b/modules/opengl-jogl/src/main/java/org/gephi/viz/engine/jogl/util/ManagedDirectBuffer.java
@@ -4,7 +4,7 @@
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
-import org.gephi.viz.engine.jogl.util.gl.BufferUtils;
+
 import static org.gephi.viz.engine.util.ArrayUtils.getNextPowerOf2;
 
 /**
@@ -44,7 +44,6 @@ public void ensureCapacity(int elements) {
 
             buffer.clear();
             GLBuffers.put(newBuffer, buffer);
-            //BufferUtils.destroyDirectBuffer(buffer);
 
             this.buffer = newBuffer;
             this.elementsCapacity = newElementsCapacity;
@@ -56,6 +55,6 @@ public int getElementsCapacity() {
     }
 
     public void destroy() {
-        //BufferUtils.destroyDirectBuffer(buffer);
+        //NOOP
     }
 }