Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-10 06:36:14 +01:00
Code Issues Actions 1 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

5
DDSTextureLoader/DDSTextureLoader.cpp
View File

@@ -18,14 +18,13 @@
// http://go.microsoft.com/fwlink/?LinkId=248929
//--------------------------------------------------------------------------------------
#include <dxgiformat.h>
#include <assert.h>
#include <algorithm>
#include <memory>
#include "DDSTextureLoader.h"
#if defined(_DEBUG) || defined(PROFILE)
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
#pragma comment(lib,"dxguid.lib")
#endif
@@ -1777,7 +1776,7 @@ HRESULT DirectX::CreateDDSTextureFromFileEx( ID3D11Device* d3dDevice,
if ( SUCCEEDED(hr) )
{
#if defined(_DEBUG) || defined(PROFILE)
#if !defined(NO_D3D11_DEBUG_NAME) && ( defined(_DEBUG) || defined(PROFILE) )
if (texture != 0 || textureView != 0)
{
CHAR strFileA[MAX_PATH];

8
DDSTextureLoader/DDSTextureLoader.h
View File

@@ -22,7 +22,13 @@
#pragma once
#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)