From 4e4209c63038e7932d912b6698bad5c77a1581b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 16 Mar 2023 14:59:18 +0100 Subject: [PATCH 1/2] Include zstd as a system header from basis_universal. Fixes #17133 --- ext/basis_universal/basisu_transcoder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/basis_universal/basisu_transcoder.cpp b/ext/basis_universal/basisu_transcoder.cpp index b5bef83c29..c698861f3b 100644 --- a/ext/basis_universal/basisu_transcoder.cpp +++ b/ext/basis_universal/basisu_transcoder.cpp @@ -155,7 +155,7 @@ // If BASISD_SUPPORT_KTX2_ZSTD is 0, UASTC files compressed with Zstd cannot be loaded. #if BASISD_SUPPORT_KTX2_ZSTD // We only use two Zstd API's: ZSTD_decompress() and ZSTD_isError() - #include "../zstd/lib/zstd.h" + #include #endif #endif From f154f4a29d301d52d45b7b344ebc1a6515d1eaa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 16 Mar 2023 15:06:38 +0100 Subject: [PATCH 2/2] Warning fix --- GPU/Common/ReplacedTexture.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/GPU/Common/ReplacedTexture.cpp b/GPU/Common/ReplacedTexture.cpp index d5db6e22c8..e964d2a4e8 100644 --- a/GPU/Common/ReplacedTexture.cpp +++ b/GPU/Common/ReplacedTexture.cpp @@ -259,7 +259,6 @@ void ReplacedTexture::Prepare(VFSBackend *vfs) { return; } - fmt = fmt; SetState(ReplacementState::ACTIVE); if (threadWaitable_)