Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-10 12:10:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

DirectXTex: add use of d3d11_1.h when available

Browse Source
This commit is contained in:
walbourn_cp 2013-09-03 15:04:04 -07:00
parent 8415e30e0a
commit c9f5fdb7a8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DirectXTex/DirectXTex.h
View File

@ -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>

4
DirectXTex/DirectXTexP.h
View File

@ -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;