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

Enable compilation with clang-cl (LLVM on Windows) (#135)

Browse Source
This commit is contained in:
Chuck Walbourn
2019-04-16 17:38:37 -07:00
parent c7261a0951
commit 86b2bb5194
13 changed files with 73 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DirectXTex/BC.h
View File

@@ -12,8 +12,8 @@
#pragma once
#include <assert.h>
#include <directxmath.h>
#include <directxpackedvector.h>
#include <DirectXMath.h>
#include <DirectXPackedVector.h>
namespace DirectX
{

5
DirectXTex/BC6HBC7.cpp
View File

@@ -20,7 +20,7 @@ using namespace DirectX::PackedVector;
// Macros
//-------------------------------------------------------------------------------------
#define SIGN_EXTEND(x,nb) ((((x)&(1<<((nb)-1)))?((~0)<<(nb)):0)|(x))
#define SIGN_EXTEND(x,nb) ((((x)&(1<<((nb)-1)))?((~0)^((1<<(nb))-1)):0)|(x))
// Because these are used in SAL annotations, they need to remain macros rather than const values
#define BC6H_MAX_REGIONS 2
@@ -507,12 +507,9 @@ namespace
INTColor& SignExtend(_In_ const LDRColorA& Prec)
{
#pragma prefast(push)
#pragma prefast(disable : 26453, "Shift here is never negative")
r = SIGN_EXTEND(r, int(Prec.r));
g = SIGN_EXTEND(g, int(Prec.g));
b = SIGN_EXTEND(b, int(Prec.b));
#pragma prefast(pop)
return *this;
}

4
DirectXTex/DirectXTex.h
View File

@@ -26,9 +26,9 @@
#endif
#endif
#include <directxmath.h>
#include <DirectXMath.h>
#include <ocidl.h>
#include <OCIdl.h>
#define DIRECTX_TEX_VERSION 161

2
DirectXTex/DirectXTexCompress.cpp
View File

@@ -16,7 +16,7 @@
#pragma warning(disable : 4616 6993)
#endif
#include "bc.h"
#include "BC.h"
using namespace DirectX;

2
DirectXTex/DirectXTexCompressGPU.cpp
View File

@@ -11,7 +11,7 @@
#include "DirectXTexp.h"
#include "bcdirectcompute.h"
#include "BCDirectCompute.h"
using namespace DirectX;

2
DirectXTex/DirectXTexDDS.cpp
View File

@@ -11,7 +11,7 @@
#include "DirectXTexp.h"
#include "dds.h"
#include "DDS.h"
using namespace DirectX;

10
DirectXTex/DirectXTexP.h
View File

@@ -67,7 +67,7 @@
#define _WIN32_WINNT_WIN10 0x0A00
#endif
#include <windows.h>
#include <Windows.h>
#if defined(_XBOX_ONE) && defined(_TITLE)
#include <d3d12_x.h>
@@ -81,8 +81,8 @@
#define _XM_NO_XMVECTOR_OVERLOADS_
#include <directxmath.h>
#include <directxpackedvector.h>
#include <DirectXMath.h>
#include <DirectXPackedVector.h>
#include <assert.h>
#include <malloc.h>
@@ -93,9 +93,9 @@
#include <stdlib.h>
#include <search.h>
#include <ole2.h>
#include <Ole2.h>
#include "directxtex.h"
#include "DirectXTex.h"
#include <wincodec.h>

2
DirectXTex/DirectXTexUtil.cpp
View File

@@ -9,7 +9,7 @@
// http://go.microsoft.com/fwlink/?LinkId=248926
//-------------------------------------------------------------------------------------
#include "DirectXTexp.h"
#include "DirectXTexP.h"
#if defined(_XBOX_ONE) && defined(_TITLE)
static_assert(XBOX_DXGI_FORMAT_R10G10B10_7E3_A2_FLOAT == DXGI_FORMAT_R10G10B10_7E3_A2_FLOAT, "Xbox One XDK mismatch detected");

4
DirectXTex/Filters.h → DirectXTex/filters.h
View File

@@ -9,8 +9,8 @@
#pragma once
#include <directxmath.h>
#include <directxpackedvector.h>
#include <DirectXMath.h>
#include <DirectXPackedVector.h>
#include <memory>