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/opengl/windows/wgl | |
| parent | 57dab52159394c2d7d48fe69417561e2f881b7a8 (diff) | |
| parent | 55a5a2ccaf3a6a3ad220bef997343793d0f58756 (diff) | |
Resolve merge conflict GLRendererQuirks
Diffstat (limited to 'src/jogl/classes/jogamp/opengl/windows/wgl')
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |