summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes')
-rw-r--r--src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java11
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java39
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java95
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java40
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java7
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java5
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java5
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java16
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java8
-rw-r--r--src/jogl/classes/jogamp/opengl/util/GLArrayHandler.java69
-rw-r--r--src/jogl/classes/jogamp/opengl/util/GLArrayHandlerInterleaved.java (renamed from src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java)31
-rw-r--r--src/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java4
-rw-r--r--src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java5
-rw-r--r--src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java5
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java17
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java16
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerInterleaved.java126
17 files changed, 210 insertions, 289 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
index e0d2490dc..eb07142a3 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
@@ -39,6 +39,7 @@ import com.jogamp.opengl.util.PMVMatrix;
import com.jogamp.opengl.util.glsl.ShaderState;
public abstract class RenderState {
+ private static final String thisKey = "jogamp.graph.curve.RenderState" ;
public static RenderState createRenderState(ShaderState st, Vertex.Factory<? extends Vertex> pointFactory) {
return new RenderStateImpl(st, pointFactory);
@@ -48,6 +49,10 @@ public abstract class RenderState {
return new RenderStateImpl(st, pointFactory, pmvMatrix);
}
+ public static final RenderState getRenderState(GL2ES2 gl) {
+ return (RenderState) gl.getContext().getAttachedObject(thisKey);
+ }
+
protected final ShaderState st;
protected final Vertex.Factory<? extends Vertex> vertexFactory;
protected final PMVMatrix pmvMatrix;
@@ -76,13 +81,13 @@ public abstract class RenderState {
// public abstract GLUniformData getStrength();
public final RenderState attachTo(GL2ES2 gl) {
- return (RenderState) gl.getContext().attachObject(RenderState.class.getName(), this);
+ return (RenderState) gl.getContext().attachObject(thisKey, this);
}
public final boolean detachFrom(GL2ES2 gl) {
- RenderState _rs = (RenderState) gl.getContext().getAttachedObject(RenderState.class.getName());
+ RenderState _rs = (RenderState) gl.getContext().getAttachedObject(thisKey);
if(_rs == this) {
- gl.getContext().detachObject(RenderState.class.getName());
+ gl.getContext().detachObject(thisKey);
return true;
}
return false;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
index 3600081bc..ee9a21095 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataClient.java
@@ -11,6 +11,7 @@ import javax.media.opengl.GL;
import javax.media.opengl.GLException;
import javax.media.opengl.fixedfunc.GLPointerFuncUtil;
+import jogamp.opengl.util.GLArrayHandler;
import jogamp.opengl.util.GLFixedArrayHandler;
import jogamp.opengl.util.glsl.GLSLArrayHandler;
@@ -45,7 +46,7 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
{
GLArrayDataClient adc = new GLArrayDataClient();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
- adc.init(null, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler, 0, 0, 0, 0);
+ adc.init(null, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler, 0, 0, 0, 0, false);
return adc;
}
@@ -76,36 +77,32 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
{
GLArrayDataClient adc = new GLArrayDataClient();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(adc);
- adc.init(null, index, comps, dataType, normalized, stride, buffer, comps*comps, false, glArrayHandler, 0, 0, 0, 0);
+ adc.init(null, index, comps, dataType, normalized, stride, buffer, comps*comps, false, glArrayHandler, 0, 0, 0, 0, false);
return adc;
}
/**
* Create a client side buffer object, using a custom GLSL array attribute name
* and starting with a new created Buffer object with initialSize size
- *
- * @param st The ShaderState managing the state of the used shader program, vertex attributes and uniforms
* @param name The custom name for the GL attribute.
* @param comps The array component number
* @param dataType The array index GL data type
* @param normalized Whether the data shall be normalized
* @param initialSize
*/
- public static GLArrayDataClient createGLSL(ShaderState st, String name,
- int comps, int dataType, boolean normalized, int initialSize)
+ public static GLArrayDataClient createGLSL(String name, int comps,
+ int dataType, boolean normalized, int initialSize)
throws GLException
{
GLArrayDataClient adc = new GLArrayDataClient();
- GLArrayHandler glArrayHandler = new GLSLArrayHandler(st, adc);
- adc.init(name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler, 0, 0, 0, 0);
+ GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
+ adc.init(name, -1, comps, dataType, normalized, 0, null, initialSize, true, glArrayHandler, 0, 0, 0, 0, true);
return adc;
}
/**
* Create a client side buffer object, using a custom GLSL array attribute name
* and starting with a given Buffer object incl it's stride
- *
- * @param st The ShaderState managing the state of the used shader program, vertex attributes and uniforms
* @param name The custom name for the GL attribute.
* @param comps The array component number
* @param dataType The array index GL data type
@@ -113,14 +110,13 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
* @param stride
* @param buffer the user define data
*/
- public static GLArrayDataClient createGLSL(ShaderState st, String name,
- int comps, int dataType, boolean normalized, int stride,
- Buffer buffer)
+ public static GLArrayDataClient createGLSL(String name, int comps,
+ int dataType, boolean normalized, int stride, Buffer buffer)
throws GLException
{
GLArrayDataClient adc = new GLArrayDataClient();
- GLArrayHandler glArrayHandler = new GLSLArrayHandler(st, adc);
- adc.init(name, -1, comps, dataType, normalized, stride, buffer, comps*comps, true, glArrayHandler, 0, 0, 0, 0);
+ GLArrayHandler glArrayHandler = new GLSLArrayHandler(adc);
+ adc.init(name, -1, comps, dataType, normalized, stride, buffer, comps*comps, true, glArrayHandler, 0, 0, 0, 0, true);
return adc;
}
@@ -162,12 +158,13 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
// init/generate VBO name if not done yet
init_vbo(gl);
}
+ final Object ext = usesGLSL ? ShaderState.getShaderState(gl) : null ;
if(enable) {
- glArrayHandler.syncData(gl, true);
- glArrayHandler.enableState(gl, true);
+ glArrayHandler.syncData(gl, true, ext);
+ glArrayHandler.enableState(gl, true, ext);
} else {
- glArrayHandler.enableState(gl, false);
- glArrayHandler.syncData(gl, false);
+ glArrayHandler.enableState(gl, false, ext);
+ glArrayHandler.syncData(gl, false, ext);
}
bufferEnabled = enable;
}
@@ -349,7 +346,7 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
protected void init(String name, int index, int comps, int dataType, boolean normalized, int stride, Buffer data,
int initialSize, boolean isVertexAttribute, GLArrayHandler handler,
- int vboName, long vboOffset, int vboUsage, int vboTarget)
+ int vboName, long vboOffset, int vboUsage, int vboTarget, boolean usesGLSL)
throws GLException
{
super.init(name, index, comps, dataType, normalized, stride, data, isVertexAttribute,
@@ -357,6 +354,7 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
this.initialSize = initialSize;
this.glArrayHandler = handler;
+ this.usesGLSL = usesGLSL;
this.sealed=false;
this.bufferEnabled=false;
this.enableBufferAlways=false;
@@ -385,5 +383,6 @@ public class GLArrayDataClient extends GLArrayDataWrapper implements GLArrayData
protected int initialSize;
protected GLArrayHandler glArrayHandler;
+ protected boolean usesGLSL;
}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
index 8b254a9c9..d3bb2e3fd 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLArrayDataServer.java
@@ -9,14 +9,14 @@ import javax.media.opengl.GLArrayData;
import javax.media.opengl.GLException;
import javax.media.opengl.fixedfunc.GLPointerFuncUtil;
+import jogamp.opengl.util.GLArrayHandler;
+import jogamp.opengl.util.GLArrayHandlerInterleaved;
import jogamp.opengl.util.GLDataArrayHandler;
import jogamp.opengl.util.GLFixedArrayHandler;
import jogamp.opengl.util.GLFixedArrayHandlerFlat;
-import jogamp.opengl.util.GLFixedArrayHandlerInterleaved;
import jogamp.opengl.util.glsl.GLSLArrayHandler;
import jogamp.opengl.util.glsl.GLSLArrayHandlerFlat;
-import com.jogamp.opengl.util.glsl.ShaderState;
public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataEditable {
@@ -53,7 +53,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
ads.init(null, index, comps, dataType, normalized, stride, buffer, buffer.limit(), false, glArrayHandler,
- 0, 0, vboUsage, GL.GL_ARRAY_BUFFER);
+ 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, false);
return ads;
}
@@ -85,15 +85,13 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLFixedArrayHandler(ads);
ads.init(null, index, comps, dataType, normalized, 0, null, initialSize, false, glArrayHandler,
- 0, 0, vboUsage, GL.GL_ARRAY_BUFFER);
+ 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, false);
return ads;
}
/**
* Create a VBO, using a custom GLSL array attribute name
* and starting with a new created Buffer object with initialSize size
- *
- * @param st The ShaderState managing the state of the used shader program, vertex attributes and uniforms
* @param name The custom name for the GL attribute
* @param comps The array component number
* @param dataType The array index GL data type
@@ -101,23 +99,20 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
* @param initialSize
* @param vboUsage {@link GL2ES2#GL_STREAM_DRAW}, {@link GL#GL_STATIC_DRAW} or {@link GL#GL_DYNAMIC_DRAW}
*/
- public static GLArrayDataServer createGLSL(ShaderState st, String name,
- int comps, int dataType, boolean normalized, int initialSize,
- int vboUsage)
+ public static GLArrayDataServer createGLSL(String name, int comps,
+ int dataType, boolean normalized, int initialSize, int vboUsage)
throws GLException
{
GLArrayDataServer ads = new GLArrayDataServer();
- GLArrayHandler glArrayHandler = new GLSLArrayHandler(st, ads);
+ GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
ads.init(name, -1, comps, dataType, normalized, 0, null, initialSize,
- true, glArrayHandler, 0, 0, vboUsage, GL.GL_ARRAY_BUFFER);
+ true, glArrayHandler, 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, true);
return ads;
}
/**
* Create a VBO, using a custom GLSL array attribute name
* and starting with a given Buffer object incl it's stride
- *
- * @param st The ShaderState managing the state of the used shader program, vertex attributes and uniforms
* @param name The custom name for the GL attribute
* @param comps The array component number
* @param dataType The array index GL data type
@@ -126,15 +121,15 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
* @param buffer the user define data
* @param vboUsage {@link GL2ES2#GL_STREAM_DRAW}, {@link GL#GL_STATIC_DRAW} or {@link GL#GL_DYNAMIC_DRAW}
*/
- public static GLArrayDataServer createGLSL(ShaderState st, String name,
- int comps, int dataType, boolean normalized, int stride,
- Buffer buffer, int vboUsage)
+ public static GLArrayDataServer createGLSL(String name, int comps,
+ int dataType, boolean normalized, int stride, Buffer buffer,
+ int vboUsage)
throws GLException
{
GLArrayDataServer ads = new GLArrayDataServer();
- GLArrayHandler glArrayHandler = new GLSLArrayHandler(st, ads);
+ GLArrayHandler glArrayHandler = new GLSLArrayHandler(ads);
ads.init(name, -1, comps, dataType, normalized, stride, buffer, buffer.limit(), true, glArrayHandler,
- 0, 0, vboUsage, GL.GL_ARRAY_BUFFER);
+ 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, true);
return ads;
}
@@ -158,7 +153,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLDataArrayHandler(ads);
ads.init(null, -1, comps, dataType, false, stride, buffer, buffer.limit(), false, glArrayHandler,
- 0, 0, vboUsage, vboTarget);
+ 0, 0, vboUsage, vboTarget, false);
return ads;
}
@@ -180,17 +175,15 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
GLArrayDataServer ads = new GLArrayDataServer();
GLArrayHandler glArrayHandler = new GLDataArrayHandler(ads);
ads.init(null, -1, comps, dataType, false, 0, null, initialSize, false, glArrayHandler,
- 0, 0, vboUsage, vboTarget);
+ 0, 0, vboUsage, vboTarget, false);
return ads;
}
/**
- * Create a VBO for interleaved array data
+ * Create a VBO for fixed function interleaved array data
* starting with a new created Buffer object with initialSize size.
- * <p>User needs to <i>configure</i> the interleaved segments via {@link #addFixedSubArray(int, int, int)}
- * for fixed function arrays or via {@link #addGLSLSubArray(ShaderState, String, int, int)} for GLSL
- * attributes.</p>
+ * <p>User needs to <i>configure</i> the interleaved segments via {@link #addFixedSubArray(int, int, int)}.</p>
*
* @param comps The total number of all interleaved components.
* @param dataType The array index GL data type
@@ -198,22 +191,19 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
* @param initialSize
* @param vboUsage {@link GL2ES2#GL_STREAM_DRAW}, {@link GL#GL_STATIC_DRAW} or {@link GL#GL_DYNAMIC_DRAW}
*/
- public static GLArrayDataServer createInterleaved(int comps, int dataType, boolean normalized, int initialSize,
+ public static GLArrayDataServer createFixedInterleaved(int comps, int dataType, boolean normalized, int initialSize,
int vboUsage)
throws GLException
{
GLArrayDataServer ads = new GLArrayDataServer();
- GLArrayHandler glArrayHandler = new GLFixedArrayHandlerInterleaved(ads);
+ GLArrayHandler glArrayHandler = new GLArrayHandlerInterleaved(ads);
ads.init(GLPointerFuncUtil.mgl_InterleaveArray, -1, comps, dataType, false, 0, null, initialSize, false, glArrayHandler,
- 0, 0, vboUsage, GL.GL_ARRAY_BUFFER);
+ 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, false);
return ads;
}
- int interleavedOffset = 0;
-
/**
- * Configure a segment of this interleaved array (see {@link #createInterleaved(int, int, boolean, int, int)})
- * for fixed function usage.
+ * Configure a segment of this fixed function interleaved array (see {@link #createFixedInterleaved(int, int, boolean, int, int)}).
* <p>
* This method may be called several times as long the sum of interleaved components does not
* exceed the total number of components of the created interleaved array.</p>
@@ -231,6 +221,9 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
final int iOffC = interleavedOffset / getComponentSizeInBytes();
throw new GLException("Interleaved offset > total components ("+iOffC+" > "+getComponentCount()+")");
}
+ if(usesGLSL) {
+ throw new GLException("buffer uses GLSL");
+ }
GLArrayDataWrapper ad = GLArrayDataWrapper.createFixed(
index, comps, getComponentType(),
getNormalized(), getStride(), getBuffer(),
@@ -245,8 +238,29 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
}
/**
- * Configure a segment of this interleaved array (see {@link #createInterleaved(int, int, boolean, int, int)})
- * for GLSL usage.
+ * Create a VBO for GLSL interleaved array data
+ * starting with a new created Buffer object with initialSize size.
+ * <p>User needs to <i>configure</i> the interleaved segments via {@link #addGLSLSubArray(int, int, int)}.</p>
+ *
+ * @param comps The total number of all interleaved components.
+ * @param dataType The array index GL data type
+ * @param normalized Whether the data shall be normalized
+ * @param initialSize
+ * @param vboUsage {@link GL2ES2#GL_STREAM_DRAW}, {@link GL#GL_STATIC_DRAW} or {@link GL#GL_DYNAMIC_DRAW}
+ */
+ public static GLArrayDataServer createGLSLInterleaved(int comps, int dataType, boolean normalized, int initialSize,
+ int vboUsage)
+ throws GLException
+ {
+ GLArrayDataServer ads = new GLArrayDataServer();
+ GLArrayHandler glArrayHandler = new GLArrayHandlerInterleaved(ads);
+ ads.init(GLPointerFuncUtil.mgl_InterleaveArray, -1, comps, dataType, false, 0, null, initialSize, false, glArrayHandler,
+ 0, 0, vboUsage, GL.GL_ARRAY_BUFFER, true);
+ return ads;
+ }
+
+ /**
+ * Configure a segment of this GLSL interleaved array (see {@link #createGLSLInterleaved(int, int, boolean, int, int)}).
* <p>
* This method may be called several times as long the sum of interleaved components does not
* exceed the total number of components of the created interleaved array.</p>
@@ -254,17 +268,18 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
* The memory of the the interleaved array is being used.</p>
* <p>
* Must be called before using the array, eg: {@link #seal(boolean)}, {@link #putf(float)}, .. </p>
- *
- * @param st The ShaderState managing the state of the used shader program, vertex attributes and uniforms
* @param name The custom name for the GL attribute, maybe null if vboTarget is {@link GL#GL_ELEMENT_ARRAY_BUFFER}
* @param comps This interleaved array segment's component number
* @param vboTarget {@link GL#GL_ARRAY_BUFFER} or {@link GL#GL_ELEMENT_ARRAY_BUFFER}
*/
- public GLArrayData addGLSLSubArray(ShaderState st, String name, int comps, int vboTarget) {
+ public GLArrayData addGLSLSubArray(String name, int comps, int vboTarget) {
if(interleavedOffset >= getComponentCount() * getComponentSizeInBytes()) {
final int iOffC = interleavedOffset / getComponentSizeInBytes();
throw new GLException("Interleaved offset > total components ("+iOffC+" > "+getComponentCount()+")");
}
+ if(!usesGLSL) {
+ throw new GLException("buffer uses fixed function");
+ }
GLArrayDataWrapper ad = GLArrayDataWrapper.createGLSL(
name, comps, getComponentType(),
getNormalized(), getStride(), getBuffer(),
@@ -272,7 +287,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
ad.setVBOEnabled(isVBO());
interleavedOffset += comps * getComponentSizeInBytes();
if(GL.GL_ARRAY_BUFFER == vboTarget) {
- GLArrayHandler handler = new GLSLArrayHandlerFlat(st, ad);
+ GLArrayHandler handler = new GLSLArrayHandlerFlat(ad);
glArrayHandler.addSubHandler(handler);
}
return ad;
@@ -341,11 +356,11 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
protected void init(String name, int index, int comps, int dataType, boolean normalized,
int stride, Buffer data, int initialSize, boolean isVertexAttribute,
GLArrayHandler glArrayHandler,
- int vboName, long vboOffset, int vboUsage, int vboTarget)
+ int vboName, long vboOffset, int vboUsage, int vboTarget, boolean usesGLSL)
throws GLException
{
super.init(name, index, comps, dataType, normalized, stride, data, initialSize, isVertexAttribute, glArrayHandler,
- vboName, vboOffset, vboUsage, vboTarget);
+ vboName, vboOffset, vboUsage, vboTarget, usesGLSL);
vboEnabled=true;
}
@@ -358,5 +373,7 @@ public class GLArrayDataServer extends GLArrayDataClient implements GLArrayDataE
vboName = tmp[0];
}
}
+
+ private int interleavedOffset = 0;
}
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java b/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
deleted file mode 100644
index b30e220bd..000000000
--- a/src/jogl/classes/com/jogamp/opengl/util/GLArrayHandler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package com.jogamp.opengl.util;
-
-import javax.media.opengl.*;
-
-/**
- * Handles consistency of buffer data and array state.
- * Implementations shall consider buffer types (VBO, ..), interleaved, etc.
- * They also need to consider array state types, i.e. fixed function or GLSL.
- */
-public interface GLArrayHandler {
-
- /**
- * Implementation shall associate the data with the array
- * and synchronize the data with the GPU.
- *
- * @param gl current GL object
- * @param enable true if array data shall be valid, otherwise false.
- */
- public void syncData(GL gl, boolean enable);
-
- /**
- * Implementation shall enable or disable the array state.
- *
- * @param gl current GL object
- * @param enable true if array shall be enabled, otherwise false.
- */
- public void enableState(GL gl, boolean enable);
-
- /**
- * Supporting interleaved arrays, where sub handlers may handle
- * the array state and the <i>master</i> handler the buffer consistency.
- *
- * @param handler the sub handler
- * @throws UnsupportedOperationException if this array handler does not support interleaved arrays
- */
- public void addSubHandler(GLArrayHandler handler) throws UnsupportedOperationException;
-
-}
-
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 a2a012e08..36abd9d4d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -49,7 +49,8 @@ import com.jogamp.opengl.util.GLArrayDataEditable;
public class ShaderState {
public static final boolean DEBUG = Debug.isPropertyDefined("jogl.debug.GLSLState", true, AccessController.getContext());
-
+ private static final String currentStateKey = "jogamp.opengl.glsl.ShaderState" ;
+
public ShaderState() {
}
@@ -78,7 +79,7 @@ public class ShaderState {
* @see com.jogamp.opengl.util.glsl.ShaderState#getCurrentShaderState()
*/
public static synchronized ShaderState getShaderState(GL gl) {
- return (ShaderState) gl.getContext().getAttachedObject(ShaderState.class.getName());
+ return (ShaderState) gl.getContext().getAttachedObject(currentStateKey);
}
/**
@@ -141,7 +142,7 @@ public class ShaderState {
if(null==shaderProgram) { throw new GLException("No program is attached"); }
if(on) {
// update the current ShaderState to the TLS ..
- gl.getContext().attachObject(ShaderState.class.getName(), this);
+ gl.getContext().attachObject(currentStateKey, this);
if(shaderProgram.linked()) {
shaderProgram.useProgram(gl, true);
if(resetAllShaderData) {
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
index c81e1f961..9ccd38bf1 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderUtil.java
@@ -461,11 +461,12 @@ public class ShaderUtil {
private static Impl getImpl(GL _gl) {
GL2ES2 gl = _gl.getGL2ES2();
GLContext context = gl.getContext();
- Impl impl = (Impl) context.getAttachedObject(ShaderUtil.class.getName());
+ Impl impl = (Impl) context.getAttachedObject(implObjectKey);
if (impl == null) {
impl = new GL2ES2Impl();
- context.attachObject(ShaderUtil.class.getName(), impl);
+ context.attachObject(implObjectKey, impl);
}
return impl;
}
+ private static final String implObjectKey = "jogamp.opengl.glsl.ShaderUtilImpl" ;
}
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java b/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
index 996ab4c02..51356ca13 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
@@ -29,7 +29,6 @@ package jogamp.graph.curve.opengl;
import java.nio.FloatBuffer;
-import javax.media.opengl.GL2ES2;
import javax.media.opengl.GLUniformData;
import jogamp.graph.curve.opengl.shader.UniformNames;
@@ -49,10 +48,6 @@ public class RenderStateImpl extends RenderState {
private final GLUniformData gcu_Alpha;
private final GLUniformData gcu_ColorStatic;
- public static final RenderState getRenderState(GL2ES2 gl) {
- return (RenderState) gl.getContext().getAttachedObject(RenderState.class.getName());
- }
-
public RenderStateImpl(ShaderState st, Vertex.Factory<? extends Vertex> pointFactory, PMVMatrix pmvMatrix) {
super(st, pointFactory, pmvMatrix);
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
index 2d13f5ba0..758d0e999 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
@@ -89,8 +89,8 @@ public class VBORegion2PES2 extends GLRegion {
indicesFbo.puts((short) 1); indicesFbo.puts((short) 2); indicesFbo.puts((short) 3);
indicesFbo.seal(true);
- texCoordFboAttr = GLArrayDataServer.createGLSL(st, AttributeNames.TEXCOORD_ATTR_NAME, 2,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ texCoordFboAttr = GLArrayDataServer.createGLSL(AttributeNames.TEXCOORD_ATTR_NAME, 2, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(texCoordFboAttr, true);
texCoordFboAttr.putf(5); texCoordFboAttr.putf(5);
texCoordFboAttr.putf(5); texCoordFboAttr.putf(6);
@@ -98,19 +98,19 @@ public class VBORegion2PES2 extends GLRegion {
texCoordFboAttr.putf(6); texCoordFboAttr.putf(5);
texCoordFboAttr.seal(true);
- verticeFboAttr = GLArrayDataServer.createGLSL(st, AttributeNames.VERTEX_ATTR_NAME, 3,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ verticeFboAttr = GLArrayDataServer.createGLSL(AttributeNames.VERTEX_ATTR_NAME, 3, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(verticeFboAttr, true);
indicesTxt = GLArrayDataServer.createData(3, GL2ES2.GL_SHORT, initialSize, GL.GL_STATIC_DRAW, GL.GL_ELEMENT_ARRAY_BUFFER);
- verticeTxtAttr = GLArrayDataServer.createGLSL(st, AttributeNames.VERTEX_ATTR_NAME, 3,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ verticeTxtAttr = GLArrayDataServer.createGLSL(AttributeNames.VERTEX_ATTR_NAME, 3, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(verticeTxtAttr, true);
- texCoordTxtAttr = GLArrayDataServer.createGLSL(st, AttributeNames.TEXCOORD_ATTR_NAME, 2,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ texCoordTxtAttr = GLArrayDataServer.createGLSL(AttributeNames.TEXCOORD_ATTR_NAME, 2, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(texCoordTxtAttr, true);
if(DEBUG_INSTANCE) {
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
index 83cd6fab9..21671386c 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -59,12 +59,12 @@ public class VBORegionSPES2 extends GLRegion {
indices = GLArrayDataServer.createData(3, GL2ES2.GL_SHORT, initialSize, GL.GL_STATIC_DRAW, GL.GL_ELEMENT_ARRAY_BUFFER);
- verticeAttr = GLArrayDataServer.createGLSL(st, AttributeNames.VERTEX_ATTR_NAME, 3,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ verticeAttr = GLArrayDataServer.createGLSL(AttributeNames.VERTEX_ATTR_NAME, 3, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(verticeAttr, true);
- texCoordAttr = GLArrayDataServer.createGLSL(st, AttributeNames.TEXCOORD_ATTR_NAME, 2,
- GL2ES2.GL_FLOAT, false, initialSize, GL.GL_STATIC_DRAW);
+ texCoordAttr = GLArrayDataServer.createGLSL(AttributeNames.TEXCOORD_ATTR_NAME, 2, GL2ES2.GL_FLOAT,
+ false, initialSize, GL.GL_STATIC_DRAW);
st.ownAttribute(texCoordAttr, true);
if(DEBUG_INSTANCE) {
diff --git a/src/jogl/classes/jogamp/opengl/util/GLArrayHandler.java b/src/jogl/classes/jogamp/opengl/util/GLArrayHandler.java
new file mode 100644
index 000000000..4a570d3a7
--- /dev/null
+++ b/src/jogl/classes/jogamp/opengl/util/GLArrayHandler.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ * conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ * of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package jogamp.opengl.util;
+
+import javax.media.opengl.*;
+
+/**
+ * Handles consistency of buffer data and array state.
+ * Implementations shall consider buffer types (VBO, ..), interleaved, etc.
+ * They also need to consider array state types, i.e. fixed function or GLSL.
+ */
+public interface GLArrayHandler {
+
+ /**
+ * Implementation shall associate the data with the array
+ * and synchronize the data with the GPU.
+ *
+ * @param gl current GL object
+ * @param enable true if array data shall be valid, otherwise false.
+ * @param ext extension object allowing passing of an implementation detail
+ */
+ public void syncData(GL gl, boolean enable, Object ext);
+
+ /**
+ * Implementation shall enable or disable the array state.
+ *
+ * @param gl current GL object
+ * @param enable true if array shall be enabled, otherwise false.
+ * @param ext extension object allowing passing of an implementation detail
+ */
+ public void enableState(GL gl, boolean enable, Object ext);
+
+ /**
+ * Supporting interleaved arrays, where sub handlers may handle
+ * the array state and the <i>master</i> handler the buffer consistency.
+ *
+ * @param handler the sub handler
+ * @throws UnsupportedOperationException if this array handler does not support interleaved arrays
+ */
+ public void addSubHandler(GLArrayHandler handler) throws UnsupportedOperationException;
+
+}
+
diff --git a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java b/src/jogl/classes/jogamp/opengl/util/GLArrayHandlerInterleaved.java
index 4bac20217..8e813a79b 100644
--- a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java
+++ b/src/jogl/classes/jogamp/opengl/util/GLArrayHandlerInterleaved.java
@@ -28,25 +28,24 @@
package jogamp.opengl.util;
-import javax.media.opengl.*;
-import javax.media.opengl.fixedfunc.*;
-import com.jogamp.opengl.util.GLArrayDataEditable;
-import com.jogamp.opengl.util.GLArrayHandler;
-
-import java.nio.*;
+import java.nio.Buffer;
import java.util.ArrayList;
import java.util.List;
+import javax.media.opengl.GL;
+
+import com.jogamp.opengl.util.GLArrayDataEditable;
+
/**
* Interleaved fixed function arrays, i.e. where this buffer data
* represents many arrays.
*/
-public class GLFixedArrayHandlerInterleaved implements GLArrayHandler {
+public class GLArrayHandlerInterleaved implements GLArrayHandler {
private GLArrayDataEditable ad;
private List<GLArrayHandler> subArrays = new ArrayList<GLArrayHandler>();
- public GLFixedArrayHandlerInterleaved(GLArrayDataEditable ad) {
+ public GLArrayHandlerInterleaved(GLArrayDataEditable ad) {
this.ad = ad;
}
@@ -54,13 +53,13 @@ public class GLFixedArrayHandlerInterleaved implements GLArrayHandler {
subArrays.add(handler);
}
- private final void syncSubData(GL gl, boolean enable) {
+ private final void syncSubData(GL gl, boolean enable, Object ext) {
for(int i=0; i<subArrays.size(); i++) {
- subArrays.get(i).syncData(gl, enable);
+ subArrays.get(i).syncData(gl, enable, ext);
}
- }
+ }
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
if(enable) {
final Buffer buffer = ad.getBuffer();
@@ -75,18 +74,18 @@ public class GLFixedArrayHandlerInterleaved implements GLArrayHandler {
ad.setVBOWritten(true);
}
}
- syncSubData(gl, true);
+ syncSubData(gl, true, ext);
} else {
- syncSubData(gl, false);
+ syncSubData(gl, false, ext);
if(ad.isVBO()) {
gl.glBindBuffer(ad.getVBOTarget(), 0);
}
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
for(int i=0; i<subArrays.size(); i++) {
- subArrays.get(i).enableState(gl, enable);
+ subArrays.get(i).enableState(gl, enable, ext);
}
}
}
diff --git a/src/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java b/src/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java
index d114abe4d..c91d6c93e 100644
--- a/src/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java
+++ b/src/jogl/classes/jogamp/opengl/util/GLDataArrayHandler.java
@@ -49,7 +49,7 @@ public class GLDataArrayHandler implements GLArrayHandler {
throw new UnsupportedOperationException();
}
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
if(!ad.isVBO()) {
// makes no sense otherwise
throw new GLException("GLDataArrayHandler can only handle VBOs.");
@@ -71,7 +71,7 @@ public class GLDataArrayHandler implements GLArrayHandler {
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
// no array association
}
}
diff --git a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java
index 2cce72ff4..8963b7985 100644
--- a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java
+++ b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandler.java
@@ -32,7 +32,6 @@ import javax.media.opengl.*;
import javax.media.opengl.fixedfunc.*;
import com.jogamp.opengl.util.GLArrayDataEditable;
-import com.jogamp.opengl.util.GLArrayHandler;
import java.nio.*;
@@ -51,7 +50,7 @@ public class GLFixedArrayHandler implements GLArrayHandler {
throw new UnsupportedOperationException();
}
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
if(enable) {
final Buffer buffer = ad.getBuffer();
if(ad.isVBO()) {
@@ -87,7 +86,7 @@ public class GLFixedArrayHandler implements GLArrayHandler {
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
final GLPointerFunc glp = gl.getGL2ES1();
if(enable) {
glp.glEnableClientState(ad.getIndex());
diff --git a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java
index 4dda9c6a1..81c782dab 100644
--- a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java
+++ b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerFlat.java
@@ -33,7 +33,6 @@ import javax.media.opengl.GLArrayData;
import javax.media.opengl.GLException;
import javax.media.opengl.fixedfunc.GLPointerFunc;
-import com.jogamp.opengl.util.GLArrayHandler;
/**
* Used for interleaved fixed function arrays, i.e. where the buffer data itself is handled
@@ -50,7 +49,7 @@ public class GLFixedArrayHandlerFlat implements GLArrayHandler {
throw new UnsupportedOperationException();
}
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
if(enable) {
final GLPointerFunc glp = gl.getGL2ES1();
switch(ad.getIndex()) {
@@ -72,7 +71,7 @@ public class GLFixedArrayHandlerFlat implements GLArrayHandler {
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
final GLPointerFunc glp = gl.getGL2ES1();
if(enable) {
glp.glEnableClientState(ad.getIndex());
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java
index d2fc52d5c..96bb02b19 100644
--- a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandler.java
@@ -33,8 +33,9 @@ import java.nio.Buffer;
import javax.media.opengl.GL;
import javax.media.opengl.GL2ES2;
+import jogamp.opengl.util.GLArrayHandler;
+
import com.jogamp.opengl.util.GLArrayDataEditable;
-import com.jogamp.opengl.util.GLArrayHandler;
import com.jogamp.opengl.util.glsl.ShaderState;
/**
@@ -43,10 +44,8 @@ import com.jogamp.opengl.util.glsl.ShaderState;
*/
public class GLSLArrayHandler implements GLArrayHandler {
private GLArrayDataEditable ad;
- private ShaderState st;
- public GLSLArrayHandler(ShaderState st, GLArrayDataEditable ad) {
- this.st = st;
+ public GLSLArrayHandler(GLArrayDataEditable ad) {
this.ad = ad;
}
@@ -54,9 +53,10 @@ public class GLSLArrayHandler implements GLArrayHandler {
throw new UnsupportedOperationException();
}
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
final GL2ES2 glsl = gl.getGL2ES2();
-
+ final ShaderState st = (ShaderState) ext;
+
if(enable) {
final Buffer buffer = ad.getBuffer();
/*
@@ -100,9 +100,10 @@ public class GLSLArrayHandler implements GLArrayHandler {
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
final GL2ES2 glsl = gl.getGL2ES2();
-
+ final ShaderState st = (ShaderState) ext;
+
if(enable) {
st.enableVertexAttribArray(glsl, ad);
} else {
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java
index 5c4aa718c..0d6da7ba4 100644
--- a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerFlat.java
@@ -31,7 +31,9 @@ package jogamp.opengl.util.glsl;
import javax.media.opengl.GL;
import javax.media.opengl.GL2ES2;
import javax.media.opengl.GLArrayData;
-import com.jogamp.opengl.util.GLArrayHandler;
+
+import jogamp.opengl.util.GLArrayHandler;
+
import com.jogamp.opengl.util.glsl.ShaderState;
/**
@@ -39,11 +41,9 @@ import com.jogamp.opengl.util.glsl.ShaderState;
* separately and interleaves many arrays.
*/
public class GLSLArrayHandlerFlat implements GLArrayHandler {
- private ShaderState st;
private GLArrayData ad;
- public GLSLArrayHandlerFlat(ShaderState st, GLArrayData ad) {
- this.st = st;
+ public GLSLArrayHandlerFlat(GLArrayData ad) {
this.ad = ad;
}
@@ -51,15 +51,17 @@ public class GLSLArrayHandlerFlat implements GLArrayHandler {
throw new UnsupportedOperationException();
}
- public final void syncData(GL gl, boolean enable) {
+ public final void syncData(GL gl, boolean enable, Object ext) {
+ final ShaderState st = (ShaderState) ext;
if(enable) {
st.vertexAttribPointer(gl.getGL2ES2(), ad);
}
}
- public final void enableState(GL gl, boolean enable) {
+ public final void enableState(GL gl, boolean enable, Object ext) {
final GL2ES2 glsl = gl.getGL2ES2();
-
+ final ShaderState st = (ShaderState) ext;
+
if(enable) {
st.enableVertexAttribArray(glsl, ad);
} else {
diff --git a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerInterleaved.java b/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerInterleaved.java
deleted file mode 100644
index c662c13d2..000000000
--- a/src/jogl/classes/jogamp/opengl/util/glsl/GLSLArrayHandlerInterleaved.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-
-package jogamp.opengl.util.glsl;
-
-import java.nio.Buffer;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES2;
-import javax.media.opengl.GLException;
-
-import jogamp.opengl.util.GLFixedArrayHandlerFlat;
-
-import com.jogamp.opengl.util.GLArrayDataEditable;
-import com.jogamp.opengl.util.GLArrayHandler;
-import com.jogamp.opengl.util.glsl.ShaderState;
-
-/**
- * Interleaved GLSL arrays, i.e. where this buffer data
- * represents many arrays.
- */
-public class GLSLArrayHandlerInterleaved implements GLArrayHandler {
- private GLArrayDataEditable ad;
- private ShaderState st;
- private List<GLArrayHandler> subArrays = new ArrayList<GLArrayHandler>();
-
- public GLSLArrayHandlerInterleaved(ShaderState st, GLArrayDataEditable ad) {
- this.st = st;
- this.ad = ad;
- }
-
- public final void addSubHandler(GLArrayHandler handler) {
- subArrays.add(handler);
- }
-
- private final void syncSubData(GL gl, boolean enable) {
- for(int i=0; i<subArrays.size(); i++) {
- subArrays.get(i).syncData(gl, enable);
- }
- }
-
- public final void syncData(GL gl, boolean enable) {
- GL2ES2 glsl = gl.getGL2ES2();
-
- if(enable) {
- Buffer buffer = ad.getBuffer();
-
- /*
- * This would be the non optimized code path:
- *
- if(ad.isVBO()) {
- glsl.glBindBuffer(ad.getVBOTarget(), ad.getVBOName());
- if(!ad.isVBOWritten()) {
- if(null!=buffer) {
- glsl.glBufferData(ad.getVBOTarget(), ad.getSizeInBytes(), buffer, ad.getVBOUsage());
- }
- ad.setVBOWritten(true);
- }
- }
- syncSubData(gl, true);
- */
- if(ad.isVBO()) {
- // bind and refresh the VBO / vertex-attr only if necessary
- if(!ad.isVBOWritten()) {
- glsl.glBindBuffer(ad.getVBOTarget(), ad.getVBOName());
- if(null!=buffer) {
- glsl.glBufferData(ad.getVBOTarget(), ad.getSizeInBytes(), buffer, ad.getVBOUsage());
- }
- ad.setVBOWritten(true);
- syncSubData(gl, true);
- } else if(st.getAttribLocation(glsl, ad) >= 0) {
- // didn't experience a performance hit on this query ..
- // (using ShaderState's location query above to validate the location)
- final int[] qi = new int[1];
- glsl.glGetVertexAttribiv(ad.getLocation(), GL2ES2.GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, qi, 0);
- if(ad.getVBOName() != qi[0]) {
- glsl.glBindBuffer(ad.getVBOTarget(), ad.getVBOName());
- syncSubData(gl, true);
- }
- }
- } else if(null!=buffer) {
- syncSubData(gl, true);
- }
- } else {
- syncSubData(gl, false);
- if(ad.isVBO()) {
- glsl.glBindBuffer(ad.getVBOTarget(), 0);
- }
- }
- }
-
- public final void enableState(GL gl, boolean enable) {
- for(int i=0; i<subArrays.size(); i++) {
- subArrays.get(i).enableState(gl, enable);
- }
- }
-
-}
-