diff options
| author | Sven Gothel <[email protected]> | 2013-05-06 17:29:35 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-05-06 17:29:35 +0200 |
| commit | 502e1d863e636808b7436354c3b639fc2f92bf29 (patch) | |
| tree | d40c3e80755a60314f87e9fe17fc0e537f98a573 /src/jogl/classes/javax/media/opengl | |
| parent | 6ebf649d1b87944257fe492e0aef842d1b8debc2 (diff) | |
Fix GLSL Version Exposure: Type in 'static' GL -> GLSL matching, don't set GLSL version if GLSL is n/a
Diffstat (limited to 'src/jogl/classes/javax/media/opengl')
| -rw-r--r-- | src/jogl/classes/javax/media/opengl/GLContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 95342d455..bbe8d602b 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -737,14 +737,14 @@ public abstract class GLContext { if( 0 != ( CTX_PROFILE_ES & ctxOptions ) ) { res[0] = 1; res[1] = 0; // ES 2.0 -> GLSL 1.00 } else if( 1 == glMajorVersion ) { - res[0] = 1; res[0] = 10; // GL 1.x -> GLSL 1.10 + res[0] = 1; res[1] = 10; // GL 1.x -> GLSL 1.10 } else if( 2 == glMajorVersion ) { res[0] = 1; switch ( glMinorVersion ) { case 0: res[1] = 10; break; // GL 2.0 -> GLSL 1.10 default: res[1] = 20; break; // GL 2.1 -> GLSL 1.20 } - } else if( 3 == glMajorVersion && 2 >= glMajorVersion ) { + } else if( 3 == glMajorVersion && 2 >= glMinorVersion ) { res[0] = 1; switch ( glMinorVersion ) { case 0: res[1] = 30; break; // GL 3.0 -> GLSL 1.30 |