aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-10-13 21:30:51 +0200
committerSven Gothel <[email protected]>2012-10-13 21:30:51 +0200
commitacdb3d4cbbdd6ade5d347abaaac71a1a8abe48e1 (patch)
tree1ee43b2dea950e1493a743c4b65c0dbbb6f691bc /src/jogl/classes/com/jogamp/opengl
parentb98bb2d14d5d5ff96fd5c22f4f30bc685d86757b (diff)
FixedFuncPipeline: Optimize shader resource, if preset != ShaderSelectionMode.AUTO (good for mobile); Lazy shader instantiation.
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/fixedfunc/ShaderSelectionMode.java12
1 files changed, 8 insertions, 4 deletions
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