From 502e1d863e636808b7436354c3b639fc2f92bf29 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 6 May 2013 17:29:35 +0200
Subject: Fix GLSL Version Exposure: Type in 'static' GL -> GLSL matching,
don't set GLSL version if GLSL is n/a
---
src/jogl/classes/jogamp/opengl/GLContextImpl.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'src/jogl/classes/jogamp/opengl/GLContextImpl.java')
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index bd2d21cc9..f16834d28 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1047,7 +1047,7 @@ public abstract class GLContextImpl extends GLContext {
ctxOptions = ctp;
if(useGL) {
ctxGLSLVersion = VersionNumber.zeroVersion;
- if(major >= 2) { // >= ES2 || GL2.0
+ if( hasGLSL() ) { // >= ES2 || GL2.0
final String glslVersion = gl.glGetString(GL2ES2.GL_SHADING_LANGUAGE_VERSION);
if( null != glslVersion ) {
ctxGLSLVersion = new VersionNumber(glslVersion, ".");
@@ -1055,12 +1055,12 @@ public abstract class GLContextImpl extends GLContext {
ctxGLSLVersion = VersionNumber.zeroVersion; // failed ..
}
}
+ if( ctxGLSLVersion.isZero() ) {
+ final int[] sver = new int[2];
+ getStaticGLSLVersionNumber(major, minor, ctxOptions, sver);
+ ctxGLSLVersion = new VersionNumber(sver[0], sver[1], 0);
+ }
}
- if( ctxGLSLVersion.isZero() ) {
- final int[] sver = new int[2];
- getStaticGLSLVersionNumber(major, minor, ctxOptions, sver);
- ctxGLSLVersion = new VersionNumber(sver[0], sver[1], 0);
- }
}
}
--
cgit v1.2.3