AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-24 13:20:13 +00:00
Code Issues Releases Wiki Activity

More code review

Browse Source
This commit is contained in:
Chuck Walbourn 2024-09-26 14:52:23 -07:00
parent 94fc4373d2
commit 74f7445974
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DirectXTex/DirectXTexSwizzle.cpp
View File

@ -13,7 +13,6 @@
#include "DirectXTexP.h"
using namespace DirectX;
using namespace DirectX::Internal;
namespace
@ -55,10 +54,10 @@ namespace
constexpr size_t MAX_TEXTURE_DIMENSION = 16384u;
#if defined(_M_X64) || defined(_M_ARM64)
constexpr size_t MAX_TEXTURE_SIZE = 16384u * 16384u * 16u;
#if defined(_M_X64) || defined(_M_ARM64) || __x86_64__ || __aarch64__
constexpr uint64_t MAX_TEXTURE_SIZE = 16384u * 16384u * 16u;
#else
constexpr size_t MAX_TEXTURE_SIZE = UINT32_MAX;
constexpr uint64_t MAX_TEXTURE_SIZE = UINT32_MAX;
#endif
// Standard Swizzle is not defined for these formats.
@ -147,7 +146,7 @@ namespace
if (!dptr)
return E_POINTER;
if ((srcImage.rowPitch > UINT32_MAX) || (destImage.rowPitch > UINT32_MAX))
if (srcImage.rowPitch > UINT32_MAX)
return HRESULT_E_ARITHMETIC_OVERFLOW;
const size_t height = isCompressed ? (srcImage.height + 3) / 4 : srcImage.height;
@ -216,7 +215,7 @@ namespace
if (!dptr)
return E_POINTER;
if ((srcImage.rowPitch > UINT32_MAX) || (destImage.rowPitch > UINT32_MAX))
if (srcImage.rowPitch > UINT32_MAX)
return HRESULT_E_ARITHMETIC_OVERFLOW;
const size_t height = isCompressed ? (srcImage.height + 3) / 4 : srcImage.height;
@ -296,9 +295,6 @@ namespace
if (!dptr)
return E_POINTER;
if (destImage.rowPitch > UINT32_MAX)
return HRESULT_E_ARITHMETIC_OVERFLOW;
// TODO: linear to swizzle x,y,z
return E_NOTIMPL;
}
@ -320,9 +316,6 @@ namespace
if (!dptr)
return E_POINTER;
if (destImage.rowPitch > UINT32_MAX)
return HRESULT_E_ARITHMETIC_OVERFLOW;
// TODO: swizzle x,y,z to linear
return E_NOTIMPL;
}