From 48201a6ea6471eb5951edb735b36156ab3410a15 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 23 Apr 2011 06:12:10 +0200 Subject: Refactored graph: Reduce/remove data copy/recreation; Shader cleanup - Pass the current GL context object where it's required - Introduce RenderState (which has ShaderState) to acquire/change shader related data (Region) - Shader Cleanup: User import for common stuff; use req. version - Reduce/remove data copy/recreation in *Region implementation - UI/RIButton: Use defaults I like :) --- src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/jogl/classes/com/jogamp/opengl/util/glsl') diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java index fe695ecb3..d3f224a2a 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java @@ -594,8 +594,6 @@ public class ShaderState { * If data location is unset it will be retrieved via {@link #glGetAttribLocation(GL2ES2, GLArrayData)}, set * and cached in this state. * - * Enables the attribute via {@link #glEnableVertexAttribArray(GL2ES2, GLArrayData)} , if it is not enabled yet. - * * @return false, if the location could not be determined, otherwise true * * @throws GLException if the program is not in use @@ -611,14 +609,6 @@ public class ShaderState { if(0 > data.getLocation()) { glGetAttribLocation(gl, data); } - if(!enabledVertexAttribArraySet.contains(data.getName())) { - if(!glEnableVertexAttribArray(gl, data)) { - if(verbose) { - Throwable tX = new Throwable("Info: glVertexAttribPointer: couldn't enable: "+data); - tX.printStackTrace(); - } - } - } if(0 <= data.getLocation()) { // only pass the data, if the attribute exists in the current shader if(DEBUG) { -- cgit v1.2.3