diff options
| -rw-r--r-- | src/classes/jogl/javax/media/j3d/JoglPipeline.java | 13 | ||||
| -rw-r--r-- | src/native/ogl/Canvas3D.c | 15 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java index 1d7d36a..c13c5ac 100644 --- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java +++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java @@ -8418,13 +8418,12 @@ class JoglPipeline extends Pipeline { if (major == 1) { if (minor == 2) { System.err.println("JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality"); - } else { - if (minor >= 3) { - gl13 = true; - } - if (minor >= 4) { - gl14 = true; - } + } + if (minor >= 3) { + gl13 = true; + } + if (minor >= 4) { + gl14 = true; } } else /* major >= 2 */ { gl13 = true; diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c index 0b412f4..37c8b9f 100644 --- a/src/native/ogl/Canvas3D.c +++ b/src/native/ogl/Canvas3D.c @@ -603,17 +603,16 @@ getPropertiesFromCurrentContext( return JNI_FALSE; } - if (versionNumbers[0] > 1) { + if (versionNumbers[0] == 1) { if (versionNumbers[1] == 2) { fprintf(stderr, "JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality\n"); - } else { - if (versionNumbers[1] >= 3) { - ctxInfo->gl13 = JNI_TRUE; - } - if (versionNumbers[1] >= 4) { - ctxInfo->gl14 = JNI_TRUE; - } + } + if (versionNumbers[1] >= 3) { + ctxInfo->gl13 = JNI_TRUE; + } + if (versionNumbers[1] >= 4) { + ctxInfo->gl14 = JNI_TRUE; } } else /* major >= 2 */ { ctxInfo->gl20 = JNI_TRUE; |