diff options
| author | Sven Gothel <[email protected]> | 2012-02-20 14:43:13 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-20 14:43:13 +0100 |
| commit | d97c54896d349e8a22c9cafec75c62476c16fdd1 (patch) | |
| tree | 5a1c0e92632ac2b8488e69765a4c803730c4f6f4 /src/jogl/classes/jogamp | |
| parent | cde4111c7be2613025ad7648e20087bc8634b4cb (diff) | |
Fix commit fb7165e690546359dee92dd60b04be69f141c87e; Clarify ShaderState.attachShaderProgram(..)
Diffstat (limited to 'src/jogl/classes/jogamp')
3 files changed, 6 insertions, 6 deletions
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) { |