From e0b2e8e19b506c8309d8270d35a7dbe24e82d323 Mon Sep 17 00:00:00 2001 From: jthedering Date: Fri, 9 Nov 2012 17:50:25 +0100 Subject: [PATCH] Added a condition to skip updateGraphicsConfigurationARB when non-hardware-accelerated capabilities are requested, because only updateGraphicsConfigurationGDI provides software rendering capabilities. --- .../opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java index 7b3bc3a..8c5ea12 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 { -- 1.8.0.msysgit.0