@@ -1049,21 +1049,25 @@ public static long glfwCreateWindow(int width, int height, CharSequence title, l
10491049 if (versionString != null ) {
10501050 try {
10511051 APIVersion apiVersion = apiParseVersion (versionString );
1052- if (3 <= apiVersion .major && apiVersion .major <= 4 ) glMajor = apiVersion .major ;
1053- if (3 <= apiVersion .minor && apiVersion .minor <= 6 ) glMinor = apiVersion .minor ;
1054- System .out .println ("Driver " +glDriver +" GL string returned " +apiVersion .major +apiVersion .minor );
1052+ int parsedGlMajor = apiVersion .major ;
1053+ int parsedGlMinor = apiVersion .minor ;
1054+ if (3 <= parsedGlMajor && parsedGlMajor <= 4 ) glMajor = parsedGlMajor ;
1055+ if (3 <= parsedGlMinor && parsedGlMinor <= 6 ) glMinor = parsedGlMinor ;
1056+ System .out .println ("Driver " +glDriver +" GL string returned " + parsedGlMajor + parsedGlMinor );
10551057 } catch (Throwable ignored ){} // In case the string is invalid/garbage
10561058 }
10571059 // Try to get values from GL30+ driver directly, only use if higher ver
10581060 try (MemoryStack stack = stackPush ()) {
10591061 IntBuffer version = stack .ints (0 , 0 );
10601062 callPV (GL_MAJOR_VERSION , memAddress (version , 0 ), GetIntegerv );
1063+ int parsedGlMajor = version .get (0 );
1064+ int parsedGlMinor = version .get (1 );
10611065 if (callI (GetError ) == GL_NO_ERROR &&
1062- 3 <= version . get ( 0 ) && version . get ( 0 ) <= 4 ) glMajor = version . get ( 0 ) ;
1066+ 3 <= parsedGlMajor && parsedGlMajor <= 4 ) glMajor = parsedGlMajor ;
10631067 callPV (GL_MINOR_VERSION , memAddress (version , 1 ), GetIntegerv );
10641068 if (callI (GetError ) == GL_NO_ERROR &&
1065- 3 <= version . get ( 0 ) && version . get ( 1 ) <= 4 ) glMinor = version . get ( 1 ) ;
1066- System .out .println ("Driver " +glDriver +" GL version returned " +version . get ( 0 )+ version . get ( 1 ) );
1069+ 3 <= parsedGlMinor && parsedGlMinor <= 4 ) glMinor = parsedGlMinor ;
1070+ System .out .println ("Driver " +glDriver +" GL version returned " + parsedGlMajor + parsedGlMinor );
10671071 }
10681072 System .out .println ("Using GL version " +glMajor +glMinor +" for GLFW window context!" );
10691073
0 commit comments