diff options
Diffstat (limited to 'src/3rdparty/angle/src/common/angleutils.h')
| -rw-r--r-- | src/3rdparty/angle/src/common/angleutils.h | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/src/3rdparty/angle/src/common/angleutils.h b/src/3rdparty/angle/src/common/angleutils.h index b343ece5bc..4cf84a3182 100644 --- a/src/3rdparty/angle/src/common/angleutils.h +++ b/src/3rdparty/angle/src/common/angleutils.h @@ -11,19 +11,31 @@ #include "common/platform.h" -#include <stddef.h> -#include <limits.h> +#include <climits> +#include <cstdarg> +#include <cstddef> #include <string> #include <set> #include <sstream> -#include <cstdarg> #include <vector> -// A macro to disallow the copy constructor and operator= functions -// This must be used in the private: declarations for a class -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ - void operator=(const TypeName&) +// A helper class to disallow copy and assignment operators +namespace angle +{ + +class NonCopyable +{ +#if !defined(_MSC_VER) || (_MSC_VER >= 1800) + public: + NonCopyable() = default; + ~NonCopyable() = default; + protected: + NonCopyable(const NonCopyable&) = delete; + void operator=(const NonCopyable&) = delete; +#endif +}; + +} template <typename T, size_t N> inline size_t ArraySize(T(&)[N]) @@ -150,13 +162,12 @@ std::string FormatString(const char *fmt, ...); #define snprintf _snprintf #endif -#define VENDOR_ID_AMD 0x1002 -#define VENDOR_ID_INTEL 0x8086 -#define VENDOR_ID_NVIDIA 0x10DE - #define GL_BGRA4_ANGLEX 0x6ABC #define GL_BGR5_A1_ANGLEX 0x6ABD #define GL_INT_64_ANGLEX 0x6ABE #define GL_STRUCT_ANGLEX 0x6ABF +// Hidden enum for the NULL D3D device type. +#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE 0x6AC0 + #endif // COMMON_ANGLEUTILS_H_ |