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/opengl/util/glsl/ShaderState.java38
-rwxr-xr-xsrc/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java2
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java2
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java8
4 files changed, 15 insertions, 35 deletions
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 a276018d9..4b680b849 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderState.java
@@ -197,27 +197,10 @@ public class ShaderState {
* as well as switching to another program on the fly,
* while managing all attribute and uniform data.</p>
*
- * <p>[Re]sets all data and use program in case of a program switch.<br>
+ * <p>[Re]sets all data and use program in case of a program switch.</p>
*
- * Use program if linked and if previous program was in use.</p>
- *
- * @throws GLException if program was not linked and linking fails
- */
- public synchronized void attachShaderProgram(GL2ES2 gl, ShaderProgram prog) throws GLException {
- attachShaderProgram(gl, prog, false);
- }
-
- /**
- * Attach or switch a shader program
- *
- * <p>Attaching a shader program the first time,
- * as well as switching to another program on the fly,
- * while managing all attribute and uniform data.</p>
- *
- * <p>[Re]sets all data and use program in case of a program switch.<br>
- *
- * Use program if linked and if previous program was in use,
- * or if <code>enable</code> is true.</p>
+ * <p>Use program, {@link #useProgram(GL2ES2, boolean)},
+ * if <code>enable</code> is <code>true</code>.</p>
*
* @throws GLException if program was not linked and linking fails
*/
@@ -227,7 +210,7 @@ public class ShaderState {
if(DEBUG) {
int curId = (null!=shaderProgram)?shaderProgram.id():-1;
int newId = (null!=prog)?prog.id():-1;
- System.err.println("Info: attachShaderProgram: "+curId+" -> "+newId+"\n\t"+shaderProgram+"\n\t"+prog);
+ System.err.println("Info: attachShaderProgram: "+curId+" -> "+newId+" (enable: "+enable+")\n\t"+shaderProgram+"\n\t"+prog);
if(verbose) {
Throwable tX = new Throwable("Info: attachShaderProgram: Trace");
tX.printStackTrace();
@@ -241,15 +224,12 @@ public class ShaderState {
}
return;
}
- prgInUse = shaderProgram.inUse();
-
- if(prgInUse) {
- // only disable if in use
- if(null != prog) {
+ if(shaderProgram.inUse()) {
+ if(null != prog && enable) {
// new program will issue glUseProgram(..)
shaderProgram.programInUse = false;
} else {
- // no new program - disable
+ // no new 'enabled' program - disable
useProgram(gl, false);
}
}
@@ -262,9 +242,9 @@ public class ShaderState {
if(null!=shaderProgram) {
// [re]set all data and use program if switching program,
// or use program if program is linked
- if(shaderProgram.linked() || resetAllShaderData) {
+ if(resetAllShaderData || enable) {
useProgram(gl, true); // may reset all data
- if(!prgInUse && !enable) {
+ if(!enable) {
useProgram(gl, false);
}
}
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
index 0217a6369..06499208f 100755
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -66,7 +66,7 @@ public class RegionRendererImpl01 extends RegionRenderer {
sp.add(rsFp);
sp.init(gl);
- st.attachShaderProgram(gl, sp);
+ st.attachShaderProgram(gl, sp, false);
st.bindAttribLocation(gl, AttributeNames.VERTEX_ATTR_IDX, AttributeNames.VERTEX_ATTR_NAME);
st.bindAttribLocation(gl, AttributeNames.TEXCOORD_ATTR_IDX, AttributeNames.TEXCOORD_ATTR_NAME);
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
index 5ed3529bf..fa57b3468 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/TextRendererImpl01.java
@@ -59,7 +59,7 @@ public class TextRendererImpl01 extends TextRenderer {
sp.add(rsFp);
sp.init(gl);
- st.attachShaderProgram(gl, sp);
+ st.attachShaderProgram(gl, sp, false);
st.bindAttribLocation(gl, AttributeNames.VERTEX_ATTR_IDX, AttributeNames.VERTEX_ATTR_NAME);
st.bindAttribLocation(gl, AttributeNames.TEXCOORD_ATTR_IDX, AttributeNames.TEXCOORD_ATTR_NAME);
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 973bcc147..41a694e9e 100644
--- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
@@ -365,15 +365,15 @@ public class FixedFuncPipeline {
if(textureEnabled) {
if(lightingEnabled) {
- shaderState.attachShaderProgram(gl, shaderProgramColorTextureLight);
+ shaderState.attachShaderProgram(gl, shaderProgramColorTextureLight, true);
} else {
- shaderState.attachShaderProgram(gl, shaderProgramColorTexture);
+ shaderState.attachShaderProgram(gl, shaderProgramColorTexture, true);
}
} else {
if(lightingEnabled) {
- shaderState.attachShaderProgram(gl, shaderProgramColorLight);
+ shaderState.attachShaderProgram(gl, shaderProgramColorLight, true);
} else {
- shaderState.attachShaderProgram(gl, shaderProgramColor);
+ shaderState.attachShaderProgram(gl, shaderProgramColor, true);
}
}
if(DEBUG) {