From c1ad5aac9f0ad6e1bed67c7a588c9463be71edf0 Mon Sep 17 00:00:00 2001
From: Chien Yang <jada@dev.java.net>
Date: Fri, 9 Mar 2007 21:31:45 +0000
Subject: Fixed a logic bug setting gl version flags.

git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@794 ba19aa83-45c5-6ac9-afd3-db810772062c
---
 src/classes/jogl/javax/media/j3d/JoglPipeline.java | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'src/classes/jogl')

diff --git a/src/classes/jogl/javax/media/j3d/JoglPipeline.java b/src/classes/jogl/javax/media/j3d/JoglPipeline.java
index 9d8a678..1d7d36a 100644
--- a/src/classes/jogl/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/jogl/javax/media/j3d/JoglPipeline.java
@@ -8414,23 +8414,24 @@ class JoglPipeline extends Pipeline {
         boolean gl20 = false;
         boolean gl14 = false;
         boolean gl13 = false;
-        if (major > 1) {
-            // OpenGL 2.x -- set flags for 1.3 and 2.0 or greater
-            gl20 = true;
-            gl14 = true;
-            gl13 = true;
-        } else {
+        
+        if (major == 1) {
             if (minor == 2) {
                 System.err.println("JAVA 3D: OpenGL 1.2 detected; will run with reduced functionality");
-            } else if ( minor == 4 ) {
-                gl14 = true;
-                gl13 = true;                
-            }
-            else {
-                gl13 = true;
+            } else {
+                if (minor >= 3) {
+                    gl13 = true;
+                }
+                if (minor >= 4) {
+                    gl14 = true;
+                }
             }
+        } else /* major >= 2 */ {
+            gl13 = true;
+            gl14 = true;
+            gl20 = true;
         }
-        
+
         if (gl20) {
             assert gl13;
             assert gl14;
-- 
cgit v1.2.3