summaryrefslogtreecommitdiffstats
path: root/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparty/libktx/lib/dfdutils/vk2dfd.inl')
-rw-r--r--thirdparty/libktx/lib/dfdutils/vk2dfd.inl115
1 files changed, 92 insertions, 23 deletions
diff --git a/thirdparty/libktx/lib/dfdutils/vk2dfd.inl b/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
index 4ae1e6d5e1..25c7a2c238 100644
--- a/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
+++ b/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
@@ -5,9 +5,6 @@
Automatically generated by makevk2dfd.pl.
*************************************************************************/
-/* Vulkan combined depth & stencil formats are not included here
- * because they do not exist outside a Vulkan device.
- */
case VK_FORMAT_R4G4_UNORM_PACK8: {
int channels[] = {1,0}; int bits[] = {4,4};
return createDFDPacked(0, 2, bits, channels, s_UNORM);
@@ -222,6 +219,9 @@ case VK_FORMAT_D16_UNORM: return createDFDDepthStencil(16,0,2);
case VK_FORMAT_X8_D24_UNORM_PACK32: return createDFDDepthStencil(24,0,4);
case VK_FORMAT_D32_SFLOAT: return createDFDDepthStencil(32,0,4);
case VK_FORMAT_S8_UINT: return createDFDDepthStencil(0,8,1);
+case VK_FORMAT_D16_UNORM_S8_UINT: return createDFDDepthStencil(16,8,4);
+case VK_FORMAT_D24_UNORM_S8_UINT: return createDFDDepthStencil(24,8,4);
+case VK_FORMAT_D32_SFLOAT_S8_UINT: return createDFDDepthStencil(32,8,8);
case VK_FORMAT_BC1_RGB_UNORM_BLOCK: return createDFDCompressed(c_BC1_RGB, 4, 4, 1, s_UNORM);
case VK_FORMAT_BC1_RGB_SRGB_BLOCK: return createDFDCompressed(c_BC1_RGB, 4, 4, 1, s_SRGB);
case VK_FORMAT_BC1_RGBA_UNORM_BLOCK: return createDFDCompressed(c_BC1_RGBA, 4, 4, 1, s_UNORM);
@@ -276,6 +276,92 @@ case VK_FORMAT_ASTC_12x10_UNORM_BLOCK: return createDFDCompressed(c_ASTC, 12, 10
case VK_FORMAT_ASTC_12x10_SRGB_BLOCK: return createDFDCompressed(c_ASTC, 12, 10, 1, s_SRGB);
case VK_FORMAT_ASTC_12x12_UNORM_BLOCK: return createDFDCompressed(c_ASTC, 12, 12, 1, s_UNORM);
case VK_FORMAT_ASTC_12x12_SRGB_BLOCK: return createDFDCompressed(c_ASTC, 12, 12, 1, s_SRGB);
+case VK_FORMAT_G8B8G8R8_422_UNORM: {
+ int channels[] = {0, 1, 0, 2}; int bits[] = {8, 8, 8, 8}; int paddings[] = {0, 0, 0, 0};
+ int position_xs[] = {64, 64, 192, 64}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_B8G8R8G8_422_UNORM: {
+ int channels[] = {1, 0, 2, 0}; int bits[] = {8, 8, 8, 8}; int paddings[] = {0, 0, 0, 0};
+ int position_xs[] = {64, 64, 64, 192}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_R10X6_UNORM_PACK16: {
+ int channels[] = {0}; int bits[] = {10}; int paddings[] = {6};
+ return createDFDPackedPadded(0, 1, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_R10X6G10X6_UNORM_2PACK16: {
+ int channels[] = {0, 1}; int bits[] = {10, 10}; int paddings[] = {6, 6};
+ return createDFDPackedPadded(0, 2, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16: {
+ int channels[] = {0, 1, 2, 3}; int bits[] = {10, 10, 10, 10}; int paddings[] = {6, 6, 6, 6};
+ return createDFDPackedPadded(0, 4, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16: {
+ int channels[] = {0, 1, 0, 2}; int bits[] = {10, 10, 10, 10}; int paddings[] = {6, 6, 6, 6};
+ int position_xs[] = {64, 64, 192, 64}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_B10X6G10X6R10X6G10X6_422_UNORM_4PACK16: {
+ int channels[] = {1, 0, 2, 0}; int bits[] = {10, 10, 10, 10}; int paddings[] = {6, 6, 6, 6};
+ int position_xs[] = {64, 64, 64, 192}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_R12X4_UNORM_PACK16: {
+ int channels[] = {0}; int bits[] = {12}; int paddings[] = {4};
+ return createDFDPackedPadded(0, 1, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_R12X4G12X4_UNORM_2PACK16: {
+ int channels[] = {0, 1}; int bits[] = {12, 12}; int paddings[] = {4, 4};
+ return createDFDPackedPadded(0, 2, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16: {
+ int channels[] = {0, 1, 2, 3}; int bits[] = {12, 12, 12, 12}; int paddings[] = {4, 4, 4, 4};
+ return createDFDPackedPadded(0, 4, bits, paddings, channels, s_UNORM);
+}
+case VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16: {
+ int channels[] = {0, 1, 0, 2}; int bits[] = {12, 12, 12, 12}; int paddings[] = {4, 4, 4, 4};
+ int position_xs[] = {64, 64, 192, 64}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_B12X4G12X4R12X4G12X4_422_UNORM_4PACK16: {
+ int channels[] = {1, 0, 2, 0}; int bits[] = {12, 12, 12, 12}; int paddings[] = {4, 4, 4, 4};
+ int position_xs[] = {64, 64, 64, 192}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_G16B16G16R16_422_UNORM: {
+ int channels[] = {0, 1, 0, 2}; int bits[] = {16, 16, 16, 16}; int paddings[] = {0, 0, 0, 0};
+ int position_xs[] = {64, 64, 192, 64}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_B16G16R16G16_422_UNORM: {
+ int channels[] = {1, 0, 2, 0}; int bits[] = {16, 16, 16, 16}; int paddings[] = {0, 0, 0, 0};
+ int position_xs[] = {64, 64, 64, 192}; int position_ys[] = {128, 128, 128, 128};
+ return createDFD422(0, 4, bits, paddings, channels, position_xs, position_ys, s_UNORM);
+}
+case VK_FORMAT_A4R4G4B4_UNORM_PACK16: {
+ int channels[] = {2,1,0,3}; int bits[] = {4,4,4,4};
+ return createDFDPacked(0, 4, bits, channels, s_UNORM);
+}
+case VK_FORMAT_A4B4G4R4_UNORM_PACK16: {
+ int channels[] = {0,1,2,3}; int bits[] = {4,4,4,4};
+ return createDFDPacked(0, 4, bits, channels, s_UNORM);
+}
+case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 4, 4, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 5, 4, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 5, 5, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 6, 5, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 6, 6, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 8, 5, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 8, 6, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 8, 8, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 10, 5, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 10, 6, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 10, 8, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 10, 10, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 12, 10, 1, s_SFLOAT);
+case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK: return createDFDCompressed(c_ASTC, 12, 12, 1, s_SFLOAT);
case VK_FORMAT_PVRTC1_2BPP_UNORM_BLOCK_IMG: return createDFDCompressed(c_PVRTC, 8, 4, 1, s_UNORM);
case VK_FORMAT_PVRTC1_4BPP_UNORM_BLOCK_IMG: return createDFDCompressed(c_PVRTC, 4, 4, 1, s_UNORM);
case VK_FORMAT_PVRTC2_2BPP_UNORM_BLOCK_IMG: return createDFDCompressed(c_PVRTC2, 8, 4, 1, s_UNORM);
@@ -284,20 +370,6 @@ case VK_FORMAT_PVRTC1_2BPP_SRGB_BLOCK_IMG: return createDFDCompressed(c_PVRTC, 8
case VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG: return createDFDCompressed(c_PVRTC, 4, 4, 1, s_SRGB);
case VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG: return createDFDCompressed(c_PVRTC2, 8, 4, 1, s_SRGB);
case VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG: return createDFDCompressed(c_PVRTC2, 4, 4, 1, s_SRGB);
-case VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 4, 4, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 5, 4, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 5, 5, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 5, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 8, 5, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 8, 6, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 8, 8, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 10, 5, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 10, 6, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 10, 8, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 10, 10, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 12, 10, 1, s_SFLOAT);
-case VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 12, 12, 1, s_SFLOAT);
#if 0
case VK_FORMAT_ASTC_3x3x3_UNORM_BLOCK_EXT: return createDFDCompressed(c_ASTC, 3, 3, 3, s_UNORM);
case VK_FORMAT_ASTC_3x3x3_SRGB_BLOCK_EXT: return createDFDCompressed(c_ASTC, 3, 3, 3, s_SRGB);
@@ -330,11 +402,8 @@ case VK_FORMAT_ASTC_6x6x6_UNORM_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6,
case VK_FORMAT_ASTC_6x6x6_SRGB_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_SRGB);
case VK_FORMAT_ASTC_6x6x6_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_SFLOAT);
#endif
-case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT: {
- int channels[] = {2,1,0,3}; int bits[] = {4,4,4,4};
- return createDFDPacked(0, 4, bits, channels, s_UNORM);
-}
-case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT: {
- int channels[] = {0,1,2,3}; int bits[] = {4,4,4,4};
+case VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR: {
+ int channels[] = {0,1,2,3}; int bits[] = {5,5,5,1};
return createDFDPacked(0, 4, bits, channels, s_UNORM);
}
+case VK_FORMAT_A8_UNORM_KHR: return createDFDAlpha(0, 1, s_UNORM);