2024-02-07 19:55:27 +01:00
|
|
|
diff --git a/thirdparty/libktx/lib/basis_transcode.cpp b/thirdparty/libktx/lib/basis_transcode.cpp
|
|
|
|
|
index ca68545e4a..d7ecb7a0fd 100644
|
|
|
|
|
--- a/thirdparty/libktx/lib/basis_transcode.cpp
|
|
|
|
|
+++ b/thirdparty/libktx/lib/basis_transcode.cpp
|
|
|
|
|
@@ -29,9 +29,9 @@
|
|
|
|
|
#include "vkformat_enum.h"
|
|
|
|
|
#include "vk_format.h"
|
|
|
|
|
#include "basis_sgd.h"
|
|
|
|
|
-#include "basisu/transcoder/basisu_file_headers.h"
|
|
|
|
|
-#include "basisu/transcoder/basisu_transcoder.h"
|
|
|
|
|
-#include "basisu/transcoder/basisu_transcoder_internal.h"
|
|
|
|
|
+#include "transcoder/basisu_file_headers.h"
|
|
|
|
|
+#include "transcoder/basisu_transcoder.h"
|
|
|
|
|
+#include "transcoder/basisu_transcoder_internal.h"
|
|
|
|
|
|
|
|
|
|
#undef DECLARE_PRIVATE
|
|
|
|
|
#undef DECLARE_PROTECTED
|
|
|
|
|
diff --git a/thirdparty/libktx/lib/dfdutils/vk2dfd.inl b/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
|
2024-04-05 10:44:32 +02:00
|
|
|
index 5104c8fcb4..3398441e8c 100644
|
2024-02-07 19:55:27 +01:00
|
|
|
--- a/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
|
|
|
|
|
+++ b/thirdparty/libktx/lib/dfdutils/vk2dfd.inl
|
|
|
|
|
@@ -370,6 +370,7 @@ 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);
|
|
|
|
|
+#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);
|
|
|
|
|
case VK_FORMAT_ASTC_3x3x3_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 3, 3, 3, s_SFLOAT);
|
|
|
|
|
@@ -400,6 +401,7 @@ case VK_FORMAT_ASTC_6x6x5_SFLOAT_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6
|
|
|
|
|
case VK_FORMAT_ASTC_6x6x6_UNORM_BLOCK_EXT: return createDFDCompressed(c_ASTC, 6, 6, 6, s_UNORM);
|
|
|
|
|
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
|
2024-04-05 10:44:32 +02:00
|
|
|
case VK_FORMAT_R16G16_S10_5_NV: return createDFDUnpacked(0, 2, 2, 0, s_S10_5);
|
2024-02-07 19:55:27 +01:00
|
|
|
case VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR: {
|
|
|
|
|
int channels[] = {0,1,2,3}; int bits[] = {5,5,5,1};
|
|
|
|
|
diff --git a/thirdparty/libktx/lib/miniz_wrapper.cpp b/thirdparty/libktx/lib/miniz_wrapper.cpp
|
|
|
|
|
index 07920c4809..cbd7da540a 100644
|
|
|
|
|
--- a/thirdparty/libktx/lib/miniz_wrapper.cpp
|
|
|
|
|
+++ b/thirdparty/libktx/lib/miniz_wrapper.cpp
|
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
|
#pragma GCC diagnostic ignored "-Wextra"
|
|
|
|
|
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
|
|
|
|
|
#endif
|
|
|
|
|
-#include "basisu/encoder/basisu_miniz.h"
|
|
|
|
|
+#include "encoder/basisu_miniz.h"
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
|
#pragma GCC diagnostic pop
|
|
|
|
|
#endif
|
