2 files changed, 27 insertions, 7 deletions

diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
index 31a8e489e..6866374bc 100644
--- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java
@@ -2133,7 +2133,7 @@ public abstract class GLContextImpl extends GLContext {
     final boolean isES = 0 != ( ctp & GLContext.CTX_PROFILE_ES );
     final boolean isX11 = NativeWindowFactory.TYPE_X11 == NativeWindowFactory.getNativeWindowType(true);
     final boolean isWindows = Platform.getOSType() == Platform.OSType.WINDOWS;
-    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ");
+    final boolean isDriverMesa = glRenderer.contains(MesaSP) || glRenderer.contains("Gallium ") || glVersion.contains(MesaSP);
 
     final boolean isDriverATICatalyst;
     final boolean isDriverNVIDIAGeForce;
@@ -2347,8 +2347,10 @@ public abstract class GLContextImpl extends GLContext {
     if( isDriverMesa ) {
         final VersionNumber mesaSafeFBOVersion = new VersionNumber(8, 0, 0);
         final VersionNumber mesaIntelBuggySharedCtx921 = new VersionNumber(9, 2, 1);
+        final VersionNumber mesaSafeDoubleBufferedPBuffer = new VersionNumber(18, 2, 2);         // Mesa 18.2.2
+        final VersionNumber mesaSafeSetSwapIntervalPostRetarget = mesaSafeDoubleBufferedPBuffer; // Mesa 18.2.2
 
-        {
+        if( vendorVersion.compareTo(mesaSafeSetSwapIntervalPostRetarget) < 0 ) {
             final int quirk = GLRendererQuirks.NoSetSwapIntervalPostRetarget;
             if(DEBUG) {
                 System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
@@ -2357,11 +2359,13 @@ public abstract class GLContextImpl extends GLContext {
         }
         if( hwAccel ) {
             // hardware-acceleration
-            final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
-            if(DEBUG) {
-                System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+            if( vendorVersion.compareTo(mesaSafeDoubleBufferedPBuffer) < 0 ) {
+                final int quirk = GLRendererQuirks.NoDoubleBufferedPBuffer;
+                if(DEBUG) {
+                    System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: Renderer " + glRenderer);
+                }
+                quirks.addQuirk( quirk );
             }
-            quirks.addQuirk( quirk );
         } else {
             // software
             if( vendorVersion.compareTo(mesaSafeFBOVersion) < 0 ) { // FIXME: Is it fixed in >= 8.0.0 ?
diff --git a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
index d37efc455..038194d58 100644
--- a/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/jogamp/opengl/egl/EGLES2DynamicLibraryBundleInfo.java
@@ -31,6 +31,8 @@ package jogamp.opengl.egl;
 import java.util.ArrayList;
 import java.util.List;
 
+import jogamp.nativewindow.BcmVCArtifacts;
+
 /**
  * <p>
  * Covering ES3 and ES2.
@@ -41,12 +43,20 @@ public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundl
         super();
     }
 
+
     @Override
     public final List<List<String>> getToolLibNames() {
+
         final List<List<String>> libsList = new ArrayList<List<String>>();
         {
             final List<String> libsGL = new ArrayList<String>();
 
+            /**
+             * Prefer libGLESv2.so over libGLESv2.so.2 for proprietary
+             * Broadcom graphics when the VC4 DRM Xorg driver isn't present
+             */
+            final boolean bcm_vc_iv_quirk = BcmVCArtifacts.guessVCIVUsed();
+
             // ES3: This is the default lib name, according to the spec
             libsGL.add("libGLESv3.so.3");
 
@@ -63,12 +73,18 @@ public final class EGLES2DynamicLibraryBundleInfo extends EGLDynamicLibraryBundl
             libsGL.add("libGLES30");
 
             // ES2: This is the default lib name, according to the spec
-            libsGL.add("libGLESv2.so.2");
+            if (!bcm_vc_iv_quirk) {
+                libsGL.add("libGLESv2.so.2");
+            }
 
             // ES2: Try these as well, if spec fails
             libsGL.add("libGLESv2.so");
             libsGL.add("GLESv2");
 
+            if (bcm_vc_iv_quirk) {
+                libsGL.add("libGLESv2.so.2");
+            }
+
             // ES2: Alternative names
             libsGL.add("GLES20");
             libsGL.add("GLESv2_CM");