aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-19 03:10:09 +0100
committerSven Gothel <[email protected]>2012-02-19 03:10:09 +0100
commitfb7165e690546359dee92dd60b04be69f141c87e (patch)
treec6fed4d26fe157d1a23760b40b88f4739ecf8ff6 /src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
parent4ae0b9a871467d3a322239b7ccb2ae682748289e (diff)
Cleanup ShaderCode/Program/State
- Add multiple sources for create ShaderCode - Add Shaderstate attachShaderProgram w/ enable flag - Clarify doc
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java')
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java3
1 files changed, 1 insertions, 2 deletions
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 7bc0c5468..973bcc147 100644
--- a/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
+++ b/src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java
@@ -449,8 +449,7 @@ public class FixedFuncPipeline {
throw new GLException("Couldn't link VertexColorLight program: "+shaderProgramColorTextureLight);
}
- shaderState.attachShaderProgram(gl, shaderProgramColor);
- shaderState.useProgram(gl, true);
+ shaderState.attachShaderProgram(gl, shaderProgramColor, true);
// mandatory ..
if(!shaderState.uniform(gl, new GLUniformData(mgl_PMVMatrix, 4, 4, pmvMatrix.glGetPMvMvitMatrixf()))) {