From acdb3d4cbbdd6ade5d347abaaac71a1a8abe48e1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 13 Oct 2012 21:30:51 +0200 Subject: FixedFuncPipeline: Optimize shader resource, if preset != ShaderSelectionMode.AUTO (good for mobile); Lazy shader instantiation. --- .../opengl/util/glsl/fixedfunc/ShaderSelectionMode.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/jogl/classes/com') diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java index fba4b755e..e6bdf702c 100644 --- a/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java +++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java @@ -14,10 +14,14 @@ public enum ShaderSelectionMode { AUTO, /** Fixed shader selection: Simple color. */ COLOR, - /** Fixed shader selection: Multi-Textured color. */ - COLOR_TEXTURE, + /** Fixed shader selection: Multi-Textured color. 2 texture units. */ + COLOR_TEXTURE2, + /** Fixed shader selection: Multi-Textured color. 4 texture units. */ + COLOR_TEXTURE4, + /** Fixed shader selection: Multi-Textured color. 8 texture units. */ + COLOR_TEXTURE8, /** Fixed shader selection: Color with vertex-lighting. */ COLOR_LIGHT_PER_VERTEX, - /** Fixed shader selection: Multi-Textured color with vertex-lighting. */ - COLOR_TEXTURE_LIGHT_PER_VERTEX + /** Fixed shader selection: Multi-Textured color with vertex-lighting. 8 texture units.*/ + COLOR_TEXTURE8_LIGHT_PER_VERTEX } \ No newline at end of file -- cgit v1.2.3