From 914dd88ead95937eb3feae842bb8787329e15f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Thu, 8 Jan 2015 17:15:03 +0100 Subject: [Windows] Enable WebGL and accelerated 2D Canvas. Now that we are using Chromium's SW compositor when using an ANGLE-based Qt build, it should be safe to re-enable those. Change-Id: Ib87ef38a5a381a389fef7e092328c9c5d116aa4e Task-number: QTBUG-42182 Reviewed-by: Jocelyn Turcotte --- src/core/web_engine_context.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index d0a8bb84f..df649606c 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -194,15 +194,6 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kEnableThreadedCompositing); parsedCommandLine->AppendSwitch(switches::kInProcessGPU); -#if defined(OS_WIN) - parsedCommandLine->AppendSwitch(switches::kDisableD3D11); - // ANGLE doesn't support multi-threading, doing texture upload from the GPU thread - // hasn't been causing problems yet but doing rendering there is conflicting with - // Qt's rendering of the scene graph. - parsedCommandLine->AppendSwitch(switches::kDisableExperimentalWebGL); - parsedCommandLine->AppendSwitch(switches::kDisableAccelerated2dCanvas); -#endif - #if defined(QTWEBENGINE_MOBILE_SWITCHES) // Inspired from the Android port's default switches parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar); -- cgit v1.2.3