Remove prohibition on HLG_UNNORMALIZED.

Author: MarkCallow

lib/texture2.c

@@ -776,7 +776,7 @@ ktxTexture2_constructFromStreamAndHeader(ktxTexture2* This, ktxStream* pStream,
         result = KTX_FILE_DATA_ERROR;
         goto cleanup;
     }
-    if (pBDFD->transfer >= KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF) {
+    if (pBDFD->transfer > KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF) {
           // Invalid transfer function
           result = KTX_FILE_DATA_ERROR;
           goto cleanup;
@@ -2046,9 +2046,6 @@ ktxTexture2_NeedsTranscoding(ktxTexture2* This)
 ktx_error_code_e
 ktxTexture2_SetTransferFunction(ktxTexture2* This, khr_df_transfer_e tf)
 {
-    if (tf == KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF)
-        return KTX_INVALID_VALUE;
-
     if (isSrgbFormat(This->vkFormat) && tf != KHR_DF_TRANSFER_SRGB)
         return KTX_INVALID_OPERATION;
 

tests/cts

@@ -259,8 +259,8 @@ struct OptionsCreate {
             { "BT1886_EOTF", KHR_DF_TRANSFER_BT1886_EOTF }, // BT1886
             { "HLG_OETF", KHR_DF_TRANSFER_HLG_OETF },
             { "HLG_EOTF", KHR_DF_TRANSFER_HLG_EOTF },
-            { "PQ_OETF", KHR_DF_TRANSFER_HLG_OETF },
-            { "PQ_EOTF", KHR_DF_TRANSFER_HLG_EOTF },
+            { "PQ_OETF", KHR_DF_TRANSFER_PQ_OETF },
+            { "PQ_EOTF", KHR_DF_TRANSFER_PQ_EOTF },
             { "DCIP3", KHR_DF_TRANSFER_DCIP3 },
             { "DCIP3_EOTF", KHR_DF_TRANSFER_DCIP3_EOTF }, // DCIP3
             { "PAL_OETF", KHR_DF_TRANSFER_PAL_OETF },
@@ -274,8 +274,7 @@ struct OptionsCreate {
             { "ACESCCT_OETF", KHR_DF_TRANSFER_ACESCCT_OETF }, // ACESCCT
             { "ADOBERGB", KHR_DF_TRANSFER_ADOBERGB },
             { "ADOBERGB_EOTF", KHR_DF_TRANSFER_ADOBERGB_EOTF }, // ADOBERGB
-            // HLG_UNNORMALIZED_OETF is deliberately excluded as it is no
-            // longer part of the HLG standard.
+            { "HLG_UNNORMALIZED_OETF", KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF },
         };
 
         std::optional<khr_df_transfer_e> result = {};

tools/ktx/command_create.cpp

@@ -886,9 +886,6 @@ void ValidationContext::validateDFDBasic(uint32_t blockIndex, const uint32_t* df
         error(DFD::BasicVersionNotSupported, blockIndex, toString(khr_df_versionnumber_e(block.versionNumber)));
 
     // Validate transferFunction
-    if (block.transfer == KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF)
-        error(DFD::BasicProhibitedTransferFunction, blockIndex, toString(khr_df_transfer_e(block.transfer)));
-
     if (block.transfer > KHR_DF_TRANSFER_HLG_UNNORMALIZED_OETF)
         error(DFD::BasicInvalidTransferFunction, blockIndex, block.transfer);