summaryrefslogtreecommitdiffstats
path: root/src/angle/src
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-09-02 15:04:43 +0300
committerAndrew Knight <andrew.knight@digia.com>2014-09-05 07:39:53 +0200
commitb858e7af4fefeed051f5a7e0795872fd1b834220 (patch)
tree653ac2e086afaa29d2ca012adbea4bb47d401102 /src/angle/src
parent2eb61feb9bb27799de836099b778f7431eb25848 (diff)
windows: Enable ANGLE D3D11 renderer by default
Also, remove the -angle-d3d11 configure option, as it no longer is necessary to select the renderer at build time. The D3D11 renderer is the default renderer in upstream ANGLE, and has been shown to be a more reliable solution for developers running over remote desktop and inside virtual machines. It also provides more features to the OpenGL ES implementation. This configuration switch does not disable the D3D9 render; if the GPU does not support D3D11, D3D9 is used instead. [ChangeLog][QtGui][Windows] The ANGLE D3D11 renderer was enabled by default. Systems which cannot use the new renderer will automatically fall back to the D3D9 renderer at runtime. Task-number: QTBUG-41031 Change-Id: If894309c07d9309c236b63c36f37679f74375133 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/angle/src')
-rw-r--r--src/angle/src/config.pri2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index 88c65802de..07a18620da 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -39,6 +39,8 @@ DEFINES += _WINDOWS \
!winrt: DEFINES += ANGLE_ENABLE_D3D9 ANGLE_SKIP_DXGI_1_2_CHECK
+CONFIG += angle_d3d11 # Remove to disable D3D11 renderer
+
angle_d3d11 {
DEFINES += ANGLE_ENABLE_D3D11 ANGLE_DEFAULT_D3D11=1
!build_pass: message("Enabling D3D11 mode for ANGLE")