From 08217de7bc0e0ffd09bd6c85d8c6d55ac63cfa33 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 29 Aug 2015 23:02:32 +0200 Subject: Bug 1203: Fix regression of ES3 minMajor constraint lack (commit b8ba30a0bc7cbd36abba37d72b45f78eb989e994) commit b8ba30a0bc7cbd36abba37d72b45f78eb989e994's GLContextImpl.createContextARBMapVersionsAvailable(..) accepted minMajor=2 for ES3 detection -> wrong of course. --- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/jogl/classes') diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 8c235a747..5a6c4e068 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1294,13 +1294,9 @@ public abstract class GLContextImpl extends GLContext { final int minor[] = new int[1]; if( CTX_PROFILE_ES == reqProfile ) { - if( 3 == reqMajor ) { // ES3 - ES2 - maxMajor=3; maxMinor=GLContext.getMaxMinor(ctp, maxMajor); - minMajor=2; minMinor=0; - } else { // ES2 or ES1 - maxMajor=reqMajor; maxMinor=GLContext.getMaxMinor(ctp, maxMajor); - minMajor=reqMajor; minMinor=0; - } + // ES3, ES2 or ES1 + maxMajor=reqMajor; maxMinor=GLContext.getMaxMinor(ctp, maxMajor); + minMajor=reqMajor; minMinor=0; } else { if( 4 == reqMajor ) { maxMajor=4; maxMinor=GLContext.getMaxMinor(ctp, maxMajor); -- cgit v1.2.3