diff options
author | Michael BrĂ¼ning <michael.bruning@digia.com> | 2014-08-27 12:42:00 +0200 |
---|---|---|
committer | Michael Bruning <michael.bruning@digia.com> | 2014-08-28 11:09:55 +0200 |
commit | 6b52e6ead90d718c2704590472d34adbbea86548 (patch) | |
tree | 7044280c583e4549e259194016720475e726c537 /src/3rdparty/angle/src/common/platform.h | |
parent | 918038ad57840f980cf65464d6f1fc4703909629 (diff) |
Let ANGLE use multithreaded devices if necessary.
This is needed to prevent lock-ups in application that use ANGLE from
multiple threads, as e.g. QtWebEngine based applications do.
The environment variable QT_D3DCREATE_MULTITHREADED is used to
communicate this from the QtWebEngine module.
Change-Id: Ibd5a5c75eb68af567d420d9a35efb3490c93b27c
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/common/platform.h')
-rw-r--r-- | src/3rdparty/angle/src/common/platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/common/platform.h b/src/3rdparty/angle/src/common/platform.h index e16e7ac0c2..cedc6f2f22 100644 --- a/src/3rdparty/angle/src/common/platform.h +++ b/src/3rdparty/angle/src/common/platform.h @@ -56,6 +56,7 @@ # if defined(ANGLE_ENABLE_D3D11) # include <d3d10_1.h> +# include <d3d10.h> # include <d3d11.h> # include <dxgi.h> # include <dxgi1_2.h> |