diff options
| author | Sven Gothel <[email protected]> | 2015-01-23 01:43:28 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-01-23 01:43:28 +0100 |
| commit | cbdd310351f2eda837e707ba7fa9ac18ff9473e4 (patch) | |
| tree | b65121432c2f0a4724a7d09bae933255ef59efcb /src/jogl/classes/jogamp | |
| parent | 57dab52159394c2d7d48fe69417561e2f881b7a8 (diff) | |
| parent | 55a5a2ccaf3a6a3ad220bef997343793d0f58756 (diff) | |
Resolve merge conflict GLRendererQuirks
Diffstat (limited to 'src/jogl/classes/jogamp')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/GLContextImpl.java | 11 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/opengl/GLContextImpl.java b/src/jogl/classes/jogamp/opengl/GLContextImpl.java index 44987bdec..b6db1813f 100644 --- a/src/jogl/classes/jogamp/opengl/GLContextImpl.java +++ b/src/jogl/classes/jogamp/opengl/GLContextImpl.java @@ -1942,6 +1942,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 6b21c81be..6cc29dddb 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java @@ -333,7 +333,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; |