Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-04 12:16:14 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Sync with latest DirectXTK versions of DDSTextureLoader, ScreenGrab, and WICTextureLoader

Browse Source
This commit is contained in:
walbourn_cp
2014-04-03 12:43:46 -07:00
parent b2f914f26d
commit 3b396e2303
6 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WICTextureLoader/WICTextureLoader.cpp
View File

@@ -28,7 +28,6 @@
// 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
@@ -42,7 +41,7 @@
#include "WICTextureLoader.h"
#if defined(_DEBUG) || defined(PROFILE)
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
#pragma comment(lib,"dxguid.lib")
#endif
@@ -53,7 +52,7 @@ using Microsoft::WRL::ComPtr;
template<UINT TNameLength>
inline void SetDebugObjectName(_In_ ID3D11DeviceChild* resource, _In_ const char (&name)[TNameLength])
{
#if defined(_DEBUG) || defined(PROFILE)
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
resource->SetPrivateData(WKPDID_D3DDebugObjectName, TNameLength - 1, name);
#else
UNREFERENCED_PARAMETER(resource);
@@ -878,7 +877,7 @@ HRESULT DirectX::CreateWICTextureFromFileEx( ID3D11Device* d3dDevice,
usage, bindFlags, cpuAccessFlags, miscFlags, forceSRGB,
texture, textureView );
#if defined(_DEBUG) || defined(PROFILE)
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
if ( SUCCEEDED(hr) )
{
if (texture != 0 || textureView != 0)

12
WICTextureLoader/WICTextureLoader.h
View File

@@ -29,11 +29,17 @@
#pragma once
#endif
#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
#error WIC is not supported on Windows Phone
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP) && (_WIN32_WINNT <= _WIN32_WINNT_WIN8)
#error WIC is not supported on Windows Phone 8.0
#endif
#include <d3d11.h>
#if defined(_XBOX_ONE) && defined(_TITLE) && MONOLITHIC
#include <d3d11_x.h>
#define DCOMMON_H_INCLUDED
#define NO_D3D11_DEBUG_NAME
#else
#include <d3d11_1.h>
#endif
#pragma warning(push)
#pragma warning(disable : 4005)