aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/opengl/util
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-20 14:43:13 +0100
committerSven Gothel <[email protected]>2012-02-20 14:43:13 +0100
commitd97c54896d349e8a22c9cafec75c62476c16fdd1 (patch)
tree5a1c0e92632ac2b8488e69765a4c803730c4f6f4 /src/jogl/classes/jogamp/opengl/util
parentcde4111c7be2613025ad7648e20087bc8634b4cb (diff)
Fix commit fb7165e690546359dee92dd60b04be69f141c87e; Clarify ShaderState.attachShaderProgram(..)
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/util')
-rw-r--r--src/jogl/classes/jogamp/opengl/util/glsl/fixedfunc/FixedFuncPipeline.java8
1 files changed, 4 insertions, 4 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 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) {