diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-09-04 15:33:33 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-09-04 15:09:34 +0200 |
| commit | 8f88cc2c0f56108c79399e15402d4e181eae0d3a (patch) | |
| tree | e75d031c6c0ae0012c8bb9ad6724425811bd9fec /src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h | |
| parent | 68206db907f2f973986e816589d2a349708e6acc (diff) | |
ANGLE: Fix compilation with MinGW + D3D11
Provide workarounds for things GCC doesn't like, and define a number
of macros not found in the MinGW headers.
Change-Id: I254c208209c0071fae5efb6727f2b3cfd5542da6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h index a31f15ee64..b54f75d859 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h +++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Renderer11.h @@ -261,7 +261,7 @@ class Renderer11 : public Renderer }; MultisampleSupportInfo getMultisampleSupportInfo(DXGI_FORMAT format); - typedef std::unordered_map<DXGI_FORMAT, MultisampleSupportInfo> MultisampleSupportMap; + typedef std::unordered_map<GLenum, MultisampleSupportInfo> MultisampleSupportMap; MultisampleSupportMap mMultisampleSupportMap; unsigned int mMaxSupportedSamples; |