From de53d193c86a02a3cdc46c5c8758192d957d1c67 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 8 Jul 2014 22:10:03 +0200 Subject: Findbugs: Misc minor issues (see below) - remove duplicate code in branch - Use Type.valueOf(primitive) - Don't use array.toString() directly - remove dead code --- .../opengl/util/glsl/fixedfunc/FixedFuncPipeline.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/jogl/classes/jogamp/opengl/util/glsl') diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java index c65ed084d..7371b0f3b 100644 --- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java +++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java @@ -748,24 +748,24 @@ public class FixedFuncPipeline { if( !gl.getContext().isCPUDataSourcingAvail() ) { throw new GLException("CPU data sourcing n/a w/ "+gl.getContext()); } - if( GL.GL_POINTS != mode ) { + // if( GL.GL_POINTS != mode ) { ((GLES2)gl).glDrawElements(mode, count, type, indices); - } else { + /* } else { // FIXME GL_POINTS ! ((GLES2)gl).glDrawElements(mode, count, type, indices); - } + } */ } } public void glDrawElements(final GL2ES2 gl, final int mode, final int count, final int type, final long indices_buffer_offset) { validate(gl, true); if ( GL2GL3.GL_QUADS == mode && !gl.isGL2() ) { throw new GLException("Cannot handle indexed QUADS on !GL2 w/ VBO due to lack of CPU index access"); - } else if( GL.GL_POINTS != mode ) { - // FIXME GL_POINTS ! + } else /* if( GL.GL_POINTS != mode ) */ { gl.glDrawElements(mode, count, type, indices_buffer_offset); - } else { + } /* else { + // FIXME GL_POINTS ! gl.glDrawElements(mode, count, type, indices_buffer_offset); - } + } */ } private final int textureEnabledCount() { -- cgit v1.2.3