diff options
| author | jthedering <[email protected]> | 2012-11-09 17:50:25 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-11-11 09:16:36 +0100 |
| commit | f67d310743cd6dee3d3005b96b61e9adae628899 (patch) | |
| tree | d5bf7ebe447250885faa052adc2065a9a62b7751 | |
| parent | 802404e08476387f656115b8542366706d7eeb3f (diff) | |
Added a condition to skip updateGraphicsConfigurationARB when non-hardware-accelerated capabilities are requested, because only updateGraphicsConfigurationGDI provides software rendering capabilities.
| -rw-r--r-- | src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java index 7b3bc3a01..8c5ea12d5 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java @@ -284,7 +284,8 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat } } try { - if( !updateGraphicsConfigurationARB((WindowsWGLDrawableFactory)factory, config, chooser, hdc, extHDC, pfdIDs) ) { + if( !((GLCapabilitiesImmutable)config.getChosenCapabilities()).getHardwareAccelerated() + || !updateGraphicsConfigurationARB((WindowsWGLDrawableFactory)factory, config, chooser, hdc, extHDC, pfdIDs) ) { updateGraphicsConfigurationGDI(config, chooser, hdc, extHDC, pfdIDs); } } finally { |