Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4added4
Adjust output directory to better work with CMake
ViNeek Dec 15, 2025
6ecf390
update to latest Khronos Data Format Specification
ViNeek Dec 15, 2025
1423327
Add CMake build script
ViNeek Dec 15, 2025
3637fca
Add dfdutils CMake target
ViNeek Dec 23, 2025
a32138f
Remove unneeded compile options from CMake script
ViNeek Dec 23, 2025
973e6b6
Add dfdutils library public include dirs
ViNeek Dec 23, 2025
f338219
Remove old build system files
ViNeek Jan 8, 2026
e3719c7
Remove .doxy-based documentation generation in favor of CMake's built…
ViNeek Jan 8, 2026
a0c40fc
Improve and simplify CMake script
ViNeek Jan 8, 2026
998fb3f
Add missing switch cases for HDR models
ViNeek Jan 9, 2026
64ae8e5
FIX typo
ViNeek Jan 9, 2026
a020d8b
Set install targets and allow both STATIC and OBJECT type linking
ViNeek Jan 9, 2026
e05b9ad
Add targets for dfd2vk_inl and vk2dfd_inl even when Perl is missing
ViNeek Jan 9, 2026
491a9d7
Add license to CMake script
ViNeek Jan 15, 2026
8b32c71
Add UNUSED macro to silence unused parameter warnings
ViNeek Jan 15, 2026
bba1a4c
Update CMake to build dfdutils as an object library
ViNeek Jan 16, 2026
748d3ca
Remove include directories directive
ViNeek Jan 16, 2026
7735d13
Add missing printdfd cases for HDR
ViNeek Jan 29, 2026
4d4a924
Match latest KDFS changes and typo fixes
ViNeek Feb 4, 2026
ee067bf
Merge branch 'main' into development
ViNeek Feb 4, 2026
07dbae3
Match latest KDFS changes and typo fixes
ViNeek Feb 4, 2026
435a010
Use proper string enum
ViNeek Feb 6, 2026
525af6b
merge with upstream
ViNeek Feb 9, 2026
dd71b9d
Support both STATIC and OBJECT type linking of dfdutils
ViNeek Feb 10, 2026
5d2275e
Consistent letter casing in names of all block-sized symbols
ViNeek Feb 18, 2026
5aae5c1
Merge branch 'KhronosGroup:main' into development
ViNeek Feb 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions KHR/khr_df.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ typedef enum _khr_df_model_e {
KHR_DF_MODEL_PVRTC2 = 165U,
/* UASTC for BASIS supercompression */
KHR_DF_MODEL_UASTC = 166U,
KHR_DF_MODEL_UASTC_LDR_4X4 = 166U,
KHR_DF_MODEL_UASTC_HDR_4X4 = 167U,
KHR_DF_MODEL_UASTC_HDR_6X6 = 168U,
KHR_DF_MODEL_UASTC_LDR_4x4 = 166U,
KHR_DF_MODEL_UASTC_HDR_4x4 = 167U,
KHR_DF_MODEL_UASTC_HDR_6x6 = 168U,
/* Proprietary formats (ATITC, etc.) should follow */
KHR_DF_MODEL_MAX = 0xFFU
} khr_df_model_e;
Expand Down Expand Up @@ -518,16 +518,16 @@ typedef enum _khr_df_model_channels_e {
KHR_DF_CHANNEL_UASTC_RRR = 4U,
KHR_DF_CHANNEL_UASTC_RRRG = 5U,
KHR_DF_CHANNEL_UASTC_RG = 6U,
/* MODEL UASTC_LDR_4X4 (alias) */
KHR_DF_CHANNEL_UASTC_LDR_4X4_RGB = 0U,
KHR_DF_CHANNEL_UASTC_LDR_4X4_RGBA = 3U,
KHR_DF_CHANNEL_UASTC_LDR_4X4_RRR = 4U,
KHR_DF_CHANNEL_UASTC_LDR_4X4_RRRG = 5U,
KHR_DF_CHANNEL_UASTC_LDR_4X4_RG = 6U,
/* MODEL UASTC_4X4_HDR */
KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB = 0U,
/* MODEL UASTC_6X6_HDR */
KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB = 0U,
/* MODEL UASTC_LDR_4x4 (alias) */
KHR_DF_CHANNEL_UASTC_LDR_4x4_RGB = 0U,
KHR_DF_CHANNEL_UASTC_LDR_4x4_RGBA = 3U,
KHR_DF_CHANNEL_UASTC_LDR_4x4_RRR = 4U,
KHR_DF_CHANNEL_UASTC_LDR_4x4_RRRG = 5U,
KHR_DF_CHANNEL_UASTC_LDR_4x4_RG = 6U,
/* MODEL UASTC_4x4_HDR */
KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB = 0U,
/* MODEL UASTC_6x6_HDR */
KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB = 0U,

/* Common channel names shared by multiple formats */
KHR_DF_CHANNEL_COMMON_LUMA = 0U,
Expand Down
20 changes: 10 additions & 10 deletions printdfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ const char* dfdToStringColorModel(khr_df_model_e value) {
return "KHR_DF_MODEL_PVRTC2";
case KHR_DF_MODEL_UASTC:
return "KHR_DF_MODEL_UASTC";
case KHR_DF_MODEL_UASTC_HDR_4X4:
return "KHR_DF_MODEL_UASTC_HDR_4X4";
case KHR_DF_MODEL_UASTC_HDR_6X6:
return "KHR_DF_MODEL_UASTC_HDR_6X6";
case KHR_DF_MODEL_UASTC_HDR_4x4:
return "KHR_DF_MODEL_UASTC_HDR_4x4";
case KHR_DF_MODEL_UASTC_HDR_6x6:
return "KHR_DF_MODEL_UASTC_HDR_6x6";
case KHR_DF_MODEL_MAX:
// These enum values are not meant for string representation. Ignore
break;
Expand Down Expand Up @@ -628,18 +628,18 @@ const char* dfdToStringChannelId(khr_df_model_e model, khr_df_model_channels_e v
return NULL;
}

case KHR_DF_MODEL_UASTC_HDR_4X4:
case KHR_DF_MODEL_UASTC_HDR_4x4:
switch (value) {
case KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB:
return "KHR_DF_CHANNEL_UASTC_HDR_4X4_RGB";
case KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB:
return "KHR_DF_CHANNEL_UASTC_HDR_4x4_RGB";
default:
return NULL;
}

case KHR_DF_MODEL_UASTC_HDR_6X6:
case KHR_DF_MODEL_UASTC_HDR_6x6:
switch (value) {
case KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB:
return "KHR_DF_CHANNEL_UASTC_HDR_6X6_RGB";
case KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB:
return "KHR_DF_CHANNEL_UASTC_HDR_6x6_RGB";
default:
return NULL;
}
Expand Down