From 85be81387d33224036b3fe2b02d74aab2926e028 Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice@daysofwonder.com>
Date: Tue, 29 Oct 2013 14:49:25 +0100
Subject: Fix #875 - ES version should be strictly validated

When initializing the context in GLContextImpl.setGLFuncAvailability
ES devices must be validated by strictly matching the major version,
otherwise on ES3 devices we were mixing ES1 implementation with ES3
contexts, ultimately crashing in a safeguard.

Signed-off-by: Brice Figureau <brice@daysofwonder.com>
---
 src/jogl/classes/jogamp/opengl/GLContextImpl.java | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'src/jogl/classes/jogamp')

diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 377ebd9f5..77e493b25 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -1386,6 +1386,8 @@ public abstract class GLContextImpl extends GLContext {
         }
     }
 
+    boolean isES = ( CTX_PROFILE_ES & ctxProfileBits ) != 0;
+    
     //
     // Validate GL version either by GL-Integer or GL-String
     //
@@ -1424,10 +1426,13 @@ public abstract class GLContextImpl extends GLContext {
                 }
                 return false;
             }
-            // Use returned GL version!
-            major = glIntMajor[0];
-            minor = glIntMinor[0];
-            versionValidated = true;
+            // impose strict matching for ES
+            if ((isES && major == glIntMajor[0]) || !isES) {
+                // Use returned GL version!
+                major = glIntMajor[0];
+                minor = glIntMinor[0];
+                versionValidated = true;
+            }
         } else {
             versionGL3IntFailed = true;
         }
@@ -1455,10 +1460,13 @@ public abstract class GLContextImpl extends GLContext {
                 }
                 return false;
             }
-            // Use returned GL version!
-            major = hasGLVersionNumber.getMajor();
-            minor = hasGLVersionNumber.getMinor();
-            versionValidated = true;
+            // impose strict matching for ES
+            if ((isES && major == hasGLVersionNumber.getMajor()) || !isES) {
+                // Use returned GL version!
+                major = hasGLVersionNumber.getMajor();
+                minor = hasGLVersionNumber.getMinor();
+                versionValidated = true;
+            }
         }
     }
     if( strictMatch && !versionValidated ) {
@@ -1551,7 +1559,7 @@ public abstract class GLContextImpl extends GLContext {
         }
     }
 
-    if( 0 != ( CTX_PROFILE_ES & ctxProfileBits ) ) {
+    if( isES ) {
         if( major >= 3 ) {
             ctxProfileBits |= CTX_IMPL_ES3_COMPAT | CTX_IMPL_ES2_COMPAT ;
             ctxProfileBits |= CTX_IMPL_FBO;
-- 
cgit v1.2.3