diff options
author | Sven Gothel <[email protected]> | 2015-08-29 23:02:32 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2015-08-29 23:02:32 +0200 |
commit | 08217de7bc0e0ffd09bd6c85d8c6d55ac63cfa33 (patch) | |
tree | 981c528aed353785853ea6e61554b64b65213ecd /src/jogl/classes/jogamp/opengl | |
parent | 89d5f1077cee358841a33b96572531e735d49e27 (diff) |
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.
Diffstat (limited to 'src/jogl/classes/jogamp/opengl')
-rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 10 |
1 files changed, 3 insertions, 7 deletions
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); |