diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/3rdparty/angle/src/libANGLE/features.h | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/3rdparty/angle/src/libANGLE/features.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/features.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/features.h b/src/3rdparty/angle/src/libANGLE/features.h index ecf486dcf7..48a194ff0b 100644 --- a/src/3rdparty/angle/src/libANGLE/features.h +++ b/src/3rdparty/angle/src/libANGLE/features.h @@ -7,6 +7,8 @@ #ifndef LIBANGLE_FEATURES_H_ #define LIBANGLE_FEATURES_H_ +#include "common/platform.h" + #define ANGLE_DISABLED 0 #define ANGLE_ENABLED 1 @@ -50,4 +52,14 @@ #define ANGLE_PROGRAM_LINK_VALIDATE_UNIFORM_PRECISION ANGLE_ENABLED #endif +// Controls if our threading code uses std::async or falls back to single-threaded operations. +// TODO(jmadill): Enable on Linux once STL chrono headers are updated. +#if !defined(ANGLE_STD_ASYNC_WORKERS) +#if defined(ANGLE_PLATFORM_WINDOWS) +#define ANGLE_STD_ASYNC_WORKERS ANGLE_ENABLED +#else +#define ANGLE_STD_ASYNC_WORKERS ANGLE_DISABLED +#endif // defined(ANGLE_PLATFORM_WINDOWS) +#endif // !defined(ANGLE_STD_ASYNC_WORKERS) + #endif // LIBANGLE_FEATURES_H_ |