Switched to c++20 standard, added IsHDR function test

DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj

@@ -231,7 +231,7 @@
       <ExternalWarningLevel>Level4</ExternalWarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <SupportJustMyCode>false</SupportJustMyCode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

Texconv/Blob.cpp

@@ -4,9 +4,9 @@
 #include "Blob.h"
 
 #include <cstring>
+#include <cstdlib>
 
-#include "Winerror.h"
-
+#include "winerror.h"
 
 Blob& Blob::operator= (Blob&& moveFrom) noexcept
 {

Texconv/Texconv_Desktop_2022_Win10.vcxproj

@@ -225,7 +225,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <DisableSpecificWarnings>26812</DisableSpecificWarnings>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ole32.lib;windowscodecs.lib;uuid.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

Texconv/texconv.cpp

@@ -3537,6 +3537,16 @@ int Convert(
             const size_t nimg = image->GetImageCount();
 
             PrintInfo(info);
+
+            outMetadata = {
+                .width = info.width,
+                .height = info.height,
+                .depth = info.depth,
+                .arraySize = info.arraySize,
+                .mipLevels = info.mipLevels,
+                .format = info.format
+            };
+
             wprintf(L"\n");
 
             // Figure out dest filename
@@ -3764,4 +3774,30 @@ int Convert(
     return retVal;
 }
 
+bool IsHDR(const char* filePath)
+{
+    FILE* f;
+    bool res = false;
+    const char* test1 = "#?RADIANCE";
+    const char* test2 = "#?RGBE";
+    if (fopen_s(&f, filePath, "r") == 0)
+    {
+        auto CheckHdr = [](const char* testStr, FILE* file)
+        {
+            char buf[16];
+
+            size_t len = strlen(testStr);
+            fseek(file, 0, 0);
+            fread_s(buf, len, 1, len, file);
+            return strncmp(testStr, buf, len) == 0;
+        };
+
+        if (CheckHdr(test1, f) || CheckHdr(test2, f))
+        {
+            res = true;
+        }
+        fclose(f);
+    }
+    return res;
+}
 }

TexconvTests/TexconvTests.vcxproj

@@ -113,7 +113,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(SolutionDir)include</AdditionalIncludeDirectories>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

TexconvTests/tests.cpp

@@ -7,24 +7,45 @@ int main()
 {
     AssetConversion::TextureConversionParams params;
 
-    params.format = DXGI_FORMAT_BC1_UNORM;
-
     const uint64_t options =
         (1ull << OPT_MIPLEVELS) |
         (1ull << OPT_FORMAT) |
-        (1ull << OPT_FIT_POWEROF2);
+        (1ull << OPT_FIT_POWEROF2) |
+        (1ull << OPT_USE_DX10);
+
+
+    {
+        params.format = DXGI_FORMAT_BC1_UNORM;
+
+        AssetConversion::TextureMetadata metadata;
+        Blob blob;
+
+        AssetConversion::Convert(params, options, "pngTexture.png", metadata, blob);
+        bool isHDR = AssetConversion::IsHDR("pngTexture.png");
+        std::ofstream fout;
+        fout.open("pngTexture.dds", std::ios::binary | std::ios::out);
+
+        fout.write(static_cast<char*>(blob.GetBufferPointer()), blob.GetBufferSize());
+
+        fout.close();
+    }
+
+    {
+        params.format = DXGI_FORMAT_BC6H_UF16;
 
-    AssetConversion::TextureMetadata metadata;
-    Blob blob;
+        AssetConversion::TextureMetadata metadata;
+        Blob blob;
 
+        AssetConversion::Convert(params, options, "hdrTexture.hdr", metadata, blob);
+        bool isHDR = AssetConversion::IsHDR("hdrTexture.hdr");
 
-    AssetConversion::Convert(params, options, "pngTexture.png", metadata, blob);
+        std::ofstream fout;
+        fout.open("hdrTexture.dds", std::ios::binary | std::ios::out);
 
-    std::ofstream fout;
-    fout.open("pngTexture.dds", std::ios::binary | std::ios::out);
+        fout.write(static_cast<char*>(blob.GetBufferPointer()), blob.GetBufferSize());
 
-    fout.write(static_cast<char*>(blob.GetBufferPointer()), blob.GetBufferSize());
+        fout.close();
+    }
 
-    fout.close();
     return 0;
 }

include/Texconv.h

@@ -6,7 +6,7 @@
 
 class Blob;
 
-namespace 
+namespace
 {
     enum OPTIONS : uint64_t
     {
@@ -75,12 +75,12 @@ namespace AssetConversion
 {
     struct TextureMetadata
     {
-        size_t          width;
-        size_t          height;     // Should be 1 for 1D textures
-        size_t          depth;      // Should be 1 for 1D or 2D textures
-        size_t          arraySize;  // For cubemap, this is a multiple of 6
-        size_t          mipLevels;
-        DXGI_FORMAT     format;
+        size_t width;
+        size_t height; // Should be 1 for 1D textures
+        size_t depth; // Should be 1 for 1D or 2D textures
+        size_t arraySize; // For cubemap, this is a multiple of 6
+        size_t mipLevels;
+        DXGI_FORMAT format;
     };
 
     struct TextureConversionParams
@@ -98,5 +98,7 @@ namespace AssetConversion
         TextureMetadata& outMetadata,
         Blob& outBlob
     );
+
+    bool IsHDR(const char* filePath);
 }
 #endif // TEXCONV_H