supertuxkart: Update to 1.4

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2022-11-26 00:19:11 +02:00
parent b879a4eccf
commit b05e2d6ca3
2 changed files with 1 additions and 52 deletions

View File

@@ -1,50 +0,0 @@
From 1cce43b2fa368152b83b12c21b3183c7affc9fa9 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:30:32 +0800
Subject: [PATCH] Fix MIPS compilation
---
src/graphics/sp/sp_texture.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp
index 383db7030..000d66cff 100644
--- a/src/graphics/sp/sp_texture.cpp
+++ b/src/graphics/sp/sp_texture.cpp
@@ -797,27 +797,27 @@ std::vector<std::pair<core::dimension2du, unsigned> >
assert(c->getReferenceCount() == 1);
std::shared_ptr<video::IImage> compressed(c);
- uint8_t* mips = new uint8_t[image->getDimension().getArea() * 4]();
- uint8_t* mips_loc = mips;
+ uint8_t* mipmaps = new uint8_t[image->getDimension().getArea() * 4]();
+ uint8_t* mipmaps_loc = mipmaps;
uint8_t* compressed_loc = (uint8_t*)compressed->lock();
squishCompressImage((uint8_t*)image->lock(),
mipmap_sizes[0].first.Width, mipmap_sizes[0].first.Height,
mipmap_sizes[0].first.Width * 4, compressed->lock(), tc_flag);
// Now compress mipmap
- generateHQMipmap(image->lock(), mipmap_sizes, mips);
+ generateHQMipmap(image->lock(), mipmap_sizes, mipmaps);
compressed_loc += mipmap_sizes[0].second;
for (unsigned mip = 1; mip < mipmap_sizes.size(); mip++)
{
- squishCompressImage(mips_loc,
+ squishCompressImage(mipmaps_loc,
mipmap_sizes[mip].first.Width, mipmap_sizes[mip].first.Height,
mipmap_sizes[mip].first.Width * 4, compressed_loc, tc_flag);
- mips_loc += mipmap_sizes[mip].first.Width *
+ mipmaps_loc += mipmap_sizes[mip].first.Width *
mipmap_sizes[mip].first.Height * 4;
compressed_loc += mipmap_sizes[mip].second;
}
- delete [] mips;
+ delete [] mipmaps;
image.swap(compressed);
#endif
return mipmap_sizes;
--
2.34.1

View File

@@ -26,10 +26,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = " \
https://github.com/supertuxkart/stk-code/releases/download/${PV}/SuperTuxKart-${PV}-src.tar.xz \
file://0001-Fix-MIPS-compilation.patch \
"
SRC_URI[sha256sum] = "eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd"
SRC_URI[sha256sum] = "9890392419baf4715313f14d5ad60746f276eed36eb580636caf44e2532c0f03"
S = "${WORKDIR}/SuperTuxKart-${PV}-src"