Revert "GLContext: Don't map compatibility profiles to core profile if the latter are not available (restrict profile aliasing) ; GLProfile does this - Simplification."

This reverts commit c8b99d197769eaec53c2def562c0ef3fc0e6a9d2.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 93c0b69b8..4632aaadc 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -928,6 +928,14 @@ public abstract class GLContextImpl extends GLContext {
             hasGL4bc = createContextARBMapVersionsAvailable(4, CTX_PROFILE_COMPAT);  // GL4bc
             success |= hasGL4bc;
             if( hasGL4bc ) {
+                if( !hasGL4 ) { // last chance .. ignore hw-accel
+                    GLContext.mapAvailableGLVersion(device, 4, CTX_PROFILE_CORE, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
+                    hasGL4   = true;
+                }
+                if( !hasGL3 ) { // last chance .. ignore hw-accel
+                    GLContext.mapAvailableGLVersion(device, 3, CTX_PROFILE_CORE, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
+                    hasGL3   = true;
+                }
                 if( 0 == ( CTX_IMPL_ACCEL_SOFT & ctxOptions ) ) {
                     // Map hw-accel GL4bc to all lower compatible profiles: GL3bc, GL2
                     GLContext.mapAvailableGLVersion(device, 3, CTX_PROFILE_COMPAT, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
@@ -944,6 +952,10 @@ public abstract class GLContextImpl extends GLContext {
             hasGL3bc = createContextARBMapVersionsAvailable(3, CTX_PROFILE_COMPAT);  // GL3bc
             success |= hasGL3bc;
             if( hasGL3bc ) {
+                if(!hasGL3) {  // last chance .. ignore hw-accel
+                    GLContext.mapAvailableGLVersion(device, 3, CTX_PROFILE_CORE, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);
+                    hasGL3   = true;
+                }
                 if( 0 == ( CTX_IMPL_ACCEL_SOFT & ctxOptions ) ) {
                     // Map hw-accel GL3bc to all lower compatible profiles: GL2
                     GLContext.mapAvailableGLVersion(device, 2, CTX_PROFILE_COMPAT, ctxVersion.getMajor(), ctxVersion.getMinor(), ctxOptions);