cpp/openttd-patchpack/source Changeset - r24900:959a621b6aa9

Changeset - r24900:959a621b6aa9

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

Michael Lutz - 3 years ago 2021-01-16 15:43:31
michi@icosahedron.de

Codechange: Make the simple Malloc sprite allocator globally usable.

6 files changed with 13 insertions and 11 deletions:

src/fontcache.cpp

src/fontcache_internal.h

src/os/macosx/font_osx.cpp

src/os/windows/font_win32.cpp

src/spritecache.cpp

src/spritecache.h

0 comments (0 inline, 0 general)

src/fontcache.cpp

➞

Show inline comments

@@ @@ -277,11 +277,6 @@ void TrueTypeFontCache::SetGlyphPtr(Glyp @@
 	this->glyph_to_sprite[GB(key, 8, 8)][GB(key, 0, 8)].duplicate = duplicate;
+}
 void *AllocateFont(size_t size)
+{
 	return MallocT<byte>(size);
+}
 /* Check if a glyph should be rendered with anti-aliasing. */
 static bool GetFontAAState(FontSize size)
@@ @@ -355,7 +350,7 @@ const Sprite *TrueTypeFontCache::GetGlyp @@
 				builtin_questionmark_data
 			};
-			Sprite *spr = BlitterFactory::GetCurrentBlitter()->Encode(&builtin_questionmark, AllocateFont);
+			Sprite *spr = BlitterFactory::GetCurrentBlitter()->Encode(&builtin_questionmark, SimpleSpriteAlloc);
 			assert(spr != nullptr);
 			GlyphEntry new_glyph;
 			new_glyph.sprite = spr;
@@ @@ -643,7 +638,7 @@ const Sprite *FreeTypeFontCache::Interna @@
+	}
 	GlyphEntry new_glyph;
-	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
 	new_glyph.width  = slot->advance.x >> 6;
 	this->SetGlyphPtr(key, &new_glyph);

src/fontcache_internal.h

➞

Show inline comments

@@ @@ -74,6 +74,4 @@ public: @@
 	bool IsBuiltInFont() override { return false; }
 };
 void *AllocateFont(size_t size);
 #endif /* FONTCACHE_INTERNAL_H */

src/os/macosx/font_osx.cpp

➞

Show inline comments

@@ @@ -333,7 +333,7 @@ const Sprite *CoreTextFontCache::Interna @@
+	}
 	GlyphEntry new_glyph;
-	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
 	new_glyph.width = (byte)std::round(CTFontGetAdvancesForGlyphs(this->font.get(), kCTFontOrientationDefault, &glyph, nullptr, 1));
 	this->SetGlyphPtr(key, &new_glyph);

src/os/windows/font_win32.cpp

➞

Show inline comments

@@ @@ -532,7 +532,7 @@ void Win32FontCache::ClearFontCache() @@
+	}
 	GlyphEntry new_glyph;
-	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
+	new_glyph.sprite = BlitterFactory::GetCurrentBlitter()->Encode(&sprite, SimpleSpriteAlloc);
 	new_glyph.width = gm.gmCellIncX;
 	this->SetGlyphPtr(key, &new_glyph);

src/spritecache.cpp

➞

Show inline comments

@@ @@ -809,6 +809,14 @@ static void *AllocSprite(size_t mem_req) @@
+}
 /**
  * Sprite allocator simply using malloc.
  */
 void *SimpleSpriteAlloc(size_t size)
+{
 	return MallocT<byte>(size);
+}
 /**
  * Handles the case when a sprite of different type is requested than is present in the SpriteCache.
  * For ST_FONT sprites, it is normal. In other cases, default sprite is loaded instead.
  * @param sprite ID of loaded sprite

src/spritecache.h

➞

Show inline comments

@@ @@ -26,6 +26,7 @@ extern uint _sprite_cache_size; @@
 typedef void *AllocatorProc(size_t size);
 void *SimpleSpriteAlloc(size_t size);
 void *GetRawSprite(SpriteID sprite, SpriteType type, AllocatorProc *allocator = nullptr, SpriteEncoder *encoder = nullptr);
 bool SpriteExists(SpriteID sprite);

0 comments (0 inline, 0 general)