Minor code review change for PPM/PFM code (#548)

2026-02-04 04:16:12 +01:00 · 2024-11-06 18:13:48 -08:00
parent 4602b8e0f0
commit 2f37de7165
6 changed files with 39 additions and 3 deletions
--- a/DDSTextureLoader/DDSTextureLoader11.cpp
+++ b/DDSTextureLoader/DDSTextureLoader11.cpp
@@ -502,7 +502,7 @@ namespace
        _In_ size_t width,
        _In_ size_t height,
        _In_ DXGI_FORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
        _Out_opt_ size_t* outRowBytes,
        _Out_opt_ size_t* outNumRows) noexcept
    {
@@ -516,6 +516,9 @@ namespace
        size_t bpe = 0;
        switch (fmt)
        {
+        case DXGI_FORMAT_UNKNOWN:
+            return E_INVALIDARG;
+
        case DXGI_FORMAT_BC1_TYPELESS:
        case DXGI_FORMAT_BC1_UNORM:
        case DXGI_FORMAT_BC1_UNORM_SRGB:
@@ -569,6 +572,15 @@ namespace
            bpe = 2;
            break;

+        #if (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
+
+        case DXGI_FORMAT_P208:
+            planar = true;
+            bpe = 2;
+            break;
+
+        #endif
+
        case DXGI_FORMAT_P010:
        case DXGI_FORMAT_P016:
            if ((height % 2) != 0)
--- a/DDSTextureLoader/DDSTextureLoader12.cpp
+++ b/DDSTextureLoader/DDSTextureLoader12.cpp
@@ -581,7 +581,7 @@ namespace
        _In_ size_t width,
        _In_ size_t height,
        _In_ DXGI_FORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
        _Out_opt_ size_t* outRowBytes,
        _Out_opt_ size_t* outNumRows) noexcept
    {
@@ -595,6 +595,9 @@ namespace
        size_t bpe = 0;
        switch (fmt)
        {
+        case DXGI_FORMAT_UNKNOWN:
+            return E_INVALIDARG;
+
        case DXGI_FORMAT_BC1_TYPELESS:
        case DXGI_FORMAT_BC1_UNORM:
        case DXGI_FORMAT_BC1_UNORM_SRGB:
--- a/DDSTextureLoader/DDSTextureLoader9.cpp
+++ b/DDSTextureLoader/DDSTextureLoader9.cpp
@@ -416,7 +416,7 @@ namespace
        _In_ size_t width,
        _In_ size_t height,
        _In_ D3DFORMAT fmt,
-        size_t* outNumBytes,
+        _Out_opt_ size_t* outNumBytes,
        _Out_opt_ size_t* outRowBytes,
        _Out_opt_ size_t* outNumRows) noexcept
    {
@@ -429,6 +429,9 @@ namespace
        size_t bpe = 0;
        switch (static_cast<int>(fmt))
        {
+        case D3DFMT_UNKNOWN:
+            return E_INVALIDARG;
+
        case D3DFMT_DXT1:
            bc = true;
            bpe = 8;