diff options
| author | Sven Gothel <[email protected]> | 2013-05-17 07:57:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-05-17 07:57:50 +0200 |
| commit | aef87b5db07d6b3f556d72ac7492fa0fba0d2de0 (patch) | |
| tree | 17e4a13aa6d3a4bb6b8e98415bb65e2e96181e8e /src/jogl | |
| parent | b2802021acf8aa9b363ebef383c8dc8c8079ffa4 (diff) | |
GLSL version determination: Use static GLSL version mapping in case of GLES - Mesa 9.1* fails otherwise since it supports ES3/300 which is returned.
Diffstat (limited to 'src/jogl')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 8c9c12e21..314db292d 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1048,7 +1048,7 @@ public abstract class GLContextImpl extends GLContext { if(useGL) { ctxGLSLVersion = VersionNumber.zeroVersion; if( hasGLSL() ) { // >= ES2 || GL2.0 - final String glslVersion = gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION); + final String glslVersion = isGLES() ? null : gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION) ; // Use static GLSL version for ES to be safe! if( null != glslVersion ) { ctxGLSLVersion = new VersionNumber(glslVersion, "."); if( ctxGLSLVersion.getMajor() < 1 ) { |