mirror of
https://github.com/microsoft/DirectXTex.git
synced 2025-07-10 20:20:13 +02:00
DirectXTex: add use of d3d11_1.h when available
This commit is contained in:
parent
8415e30e0a
commit
c9f5fdb7a8
@ -25,8 +25,11 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
#include <dxgiformat.h>
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
|
#include <d3d11_1.h>
|
||||||
|
#else
|
||||||
#include <d3d11.h>
|
#include <d3d11.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ocidl.h>
|
#include <ocidl.h>
|
||||||
|
|
||||||
|
@ -43,6 +43,8 @@
|
|||||||
|
|
||||||
#include <ole2.h>
|
#include <ole2.h>
|
||||||
|
|
||||||
|
#include "directxtex.h"
|
||||||
|
|
||||||
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
|
||||||
#include <d2d1.h>
|
#include <d2d1.h>
|
||||||
#endif
|
#endif
|
||||||
@ -56,8 +58,6 @@
|
|||||||
#define DXGI_1_2_FORMATS
|
#define DXGI_1_2_FORMATS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "directxtex.h"
|
|
||||||
|
|
||||||
#include "scoped.h"
|
#include "scoped.h"
|
||||||
|
|
||||||
struct IWICImagingFactory;
|
struct IWICImagingFactory;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user