From 2ba049d30d7c9e112c3bb2feb7c98c9666aaa3bf Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Thu, 23 Oct 2014 13:34:57 +0200 Subject: Skips ARB_create_context with ATI Radeon 3100 (see the bug 1038) --- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 11 +++++++++++ .../classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) (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 45a4f2426..06d1c9e3f 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1851,6 +1851,17 @@ public abstract class GLContextImpl extends GLContext { } quirks.addQuirk( quirk ); } + + if ( vendorVersion.compareTo(VersionNumberString.zeroVersion) == 0 ) { + final VersionNumber glVersionNumber = new VersionNumber(glVersion); + if ( glVersionNumber.getSub() <= 8787 && glRenderer.equals("ATI Radeon 3100 Graphics") ) { // "old" driver -> sub-minor = vendor version + final int quirk = GLRendererQuirks.NoARBCreateContext; + if(DEBUG) { + System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: OS "+Platform.getOSType()+", [Vendor "+glVendor+", Renderer "+glRenderer+" and Version "+glVersion+"]"); + } + quirks.addQuirk( quirk ); + } + } } else if( isDriverIntel && glRenderer.equals("Intel Bear Lake B") ) { final int quirk = GLRendererQuirks.NoPBufferWithAccum; if(DEBUG) { diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java index 33980d663..ebd107c47 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java @@ -331,7 +331,7 @@ public class WindowsWGLContext extends GLContextImpl { isProcCreateContextAttribsARBAvailable = false; isExtARBCreateContextAvailable = false; } - if ( isProcCreateContextAttribsARBAvailable && isExtARBCreateContextAvailable && !GLProfile.disableOpenGLARBContext ) { + if ( isProcCreateContextAttribsARBAvailable && isExtARBCreateContextAvailable && !GLProfile.disableOpenGLARBContext && !getRendererQuirks().exist( GLRendererQuirks.NoARBCreateContext ) ) { // initial ARB context creation contextHandle = createContextARB(shareWithHandle, true); createContextARBTried=true; -- cgit v1.2.3 From 1e039b27aa1c036f663091d1018c3c15b259b80d Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Fri, 24 Oct 2014 13:44:14 +0200 Subject: Fixes the indentation :s --- src/jogl/classes/jogamp/opengl/GLContextImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 06d1c9e3f..a44075e90 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1854,8 +1854,8 @@ public abstract class GLContextImpl extends GLContext { if ( vendorVersion.compareTo(VersionNumberString.zeroVersion) == 0 ) { final VersionNumber glVersionNumber = new VersionNumber(glVersion); - if ( glVersionNumber.getSub() <= 8787 && glRenderer.equals("ATI Radeon 3100 Graphics") ) { // "old" driver -> sub-minor = vendor version - final int quirk = GLRendererQuirks.NoARBCreateContext; + if ( glVersionNumber.getSub() <= 8787 && glRenderer.equals("ATI Radeon 3100 Graphics") ) { // "old" driver -> sub-minor = vendor version + final int quirk = GLRendererQuirks.NoARBCreateContext; if(DEBUG) { System.err.println("Quirk: "+GLRendererQuirks.toString(quirk)+": cause: OS "+Platform.getOSType()+", [Vendor "+glVendor+", Renderer "+glRenderer+" and Version "+glVersion+"]"); } -- cgit v1.2.3