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

DirectXTex: Dropped support for VS 2010 + legacy DirectX SDK without Windows 8.x SDK

Browse Source 
- Removed DXGI_1_2_FORMATS and USE_XNAMATH control defines
- Deleted *Desktop_2010_SDK81.* project files, updated *Desktop_2010.* project files to use Windows 8.1 SDK
This commit is contained in:
walbourn_cp
2014-01-15 13:14:48 -08:00
parent 92881b7438
commit f1ff6f10f2
38 changed files with 140 additions and 2252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DDSTextureLoader/DDSTextureLoader.cpp
View File

@@ -25,14 +25,6 @@
#include "DDSTextureLoader.h"
#ifndef _WIN32_WINNT_WIN8
#define _WIN32_WINNT_WIN8 0x0602
#endif
#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) && !defined(DXGI_1_2_FORMATS)
#define DXGI_1_2_FORMATS
#endif
#if defined(_DEBUG) || defined(PROFILE)
#pragma comment(lib,"dxguid.lib")
#endif
@@ -361,10 +353,7 @@ static size_t BitsPerPixel( _In_ DXGI_FORMAT fmt )
case DXGI_FORMAT_R16_SINT:
case DXGI_FORMAT_B5G6R5_UNORM:
case DXGI_FORMAT_B5G5R5A1_UNORM:
#ifdef DXGI_1_2_FORMATS
case DXGI_FORMAT_B4G4R4A4_UNORM:
#endif
return 16;
case DXGI_FORMAT_R8_TYPELESS:
@@ -577,14 +566,12 @@ static DXGI_FORMAT GetDXGIFormat( const DDS_PIXELFORMAT& ddpf )
// No DXGI format maps to ISBITMASK(0x7c00,0x03e0,0x001f,0x0000) aka D3DFMT_X1R5G5B5
#ifdef DXGI_1_2_FORMATS
if (ISBITMASK(0x0f00,0x00f0,0x000f,0xf000))
{
return DXGI_FORMAT_B4G4R4A4_UNORM;
}
// No DXGI format maps to ISBITMASK(0x0f00,0x00f0,0x000f,0x0000) aka D3DFMT_X4R4G4B4
#endif
// No 3:3:2, 3:3:2:8, or paletted DXGI formats aka D3DFMT_A8R3G3B2, D3DFMT_R3G3B2, D3DFMT_P8, D3DFMT_A8P8, etc.
break;