DeprecatedForks/crossxtex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code review feedback

Browse Source
This commit is contained in:
walbourn_cp 2015-01-30 17:31:49 -08:00
parent 5f95b87ddf
commit e23c8e19fd
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DirectXTex/DirectXTexP.h
View File

@ -37,9 +37,11 @@
#pragma warning(push)
#pragma warning(disable : 4005)
#include <wincodec.h>
#include <wrl.h>
#include <intsafe.h>
#pragma warning(pop)
#include <wrl\client.h>
#include "scoped.h"
struct IWICImagingFactory;

16
ScreenGrab/ScreenGrab.cpp
View File

@ -25,6 +25,7 @@
// For 2D array textures and cubemaps, it captures only the first image in the array
#include <dxgiformat.h>
#include <assert.h>
#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) || (_WIN32_WINNT > _WIN32_WINNT_WIN8)
@ -33,10 +34,12 @@
#pragma warning(push)
#pragma warning(disable : 4005)
#include <wincodec.h>
#include <wrl.h>
#include <intsafe.h>
#pragma warning(pop)
#endif
#include <wrl\client.h>
#include <memory>
#include "ScreenGrab.h"
@ -455,17 +458,6 @@ static void GetSurfaceInfo( _In_ size_t width,
planar = true;
bpe = 4;
break;
#if defined(_XBOX_ONE) && defined(_TITLE)
case DXGI_FORMAT_D16_UNORM_S8_UINT:
case DXGI_FORMAT_R16_UNORM_X8_TYPELESS:
case DXGI_FORMAT_X16_TYPELESS_G8_UINT:
planar = true;
bpe = 4;
break;
#endif
}
if (bc)

5
Texconv/texconv.cpp
View File

@ -12,7 +12,8 @@
#include <memory>
#include <list>
#include <wrl.h>
#include <wrl\client.h>
#include <dxgiformat.h>
@ -495,7 +496,7 @@ bool CreateDevice( _Outptr_ ID3D11Device** pDevice )
if ( !hModD3D11 )
return false;
s_DynamicD3D11CreateDevice = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>( GetProcAddress( hModD3D11, "D3D11CreateDevice" ) );
s_DynamicD3D11CreateDevice = reinterpret_cast<PFN_D3D11_CREATE_DEVICE>( reinterpret_cast<void*>( GetProcAddress( hModD3D11, "D3D11CreateDevice" ) ) );
if ( !s_DynamicD3D11CreateDevice )
return false;
}

5
WICTextureLoader/WICTextureLoader.cpp
View File

@ -28,15 +28,18 @@
// We could load multi-frame images (TIFF/GIF) into a texture array.
// For now, we just load the first frame (note: DirectXTex supports multi-frame images)
#include <dxgiformat.h>
#include <assert.h>
// VS 2010's stdint.h conflicts with intsafe.h
#pragma warning(push)
#pragma warning(disable : 4005)
#include <wincodec.h>
#include <wrl.h>
#include <intsafe.h>
#pragma warning(pop)
#include <wrl\client.h>
#include <memory>
#include "WICTextureLoader.h"