MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix exception on close, dummy surface refcount

develop
shevernitskiy 2023-09-11 07:35:27 +03:00
parent bd4d831582
commit d2bc834fa9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/modules/Textures.cpp
Unescape Escape View File

@ -58,6 +58,7 @@ static std::unordered_map<std::string, std::vector<TexposHandle>> g_tileset_to_h
static std::vector<TexposHandle> g_delayed_regs; static std::vector<TexposHandle> g_delayed_regs;
static std::mutex g_adding_mutex; static std::mutex g_adding_mutex;
static std::atomic<bool> loading_state = false; static std::atomic<bool> loading_state = false;
static SDL_Surface* dummy_surface = NULL;
// Converts an arbitrary Surface to something like the display format // Converts an arbitrary Surface to something like the display format
// (32-bit RGBA), and converts magenta to transparency if convert_magenta is set // (32-bit RGBA), and converts magenta to transparency if convert_magenta is set
@ -173,6 +174,7 @@ TexposHandle Textures::loadTexture(SDL_Surface* surface, bool reserved) {
if (texpos != -1) { if (texpos != -1) {
insert_texture(surface, texpos); insert_texture(surface, texpos);
g_handle_to_reserved_texpos.emplace(handle, texpos); g_handle_to_reserved_texpos.emplace(handle, texpos);
dummy_surface->refcount--;
return handle; return handle;
} }
@ -431,8 +433,9 @@ static void reserve_static_range() {
return; return;
} }
reserved_range.init(enabler->textures.init_texture_size); reserved_range.init(enabler->textures.init_texture_size);
auto dummy_surface = DFSDL_CreateRGBSurfaceWithFormat( dummy_surface =
SDL_DONTFREE, 0, 0, 32, SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA32); DFSDL_CreateRGBSurfaceWithFormat(0, 0, 0, 32, SDL_PixelFormatEnum::SDL_PIXELFORMAT_RGBA32);
dummy_surface->refcount += ReservedRange::size;
for (int32_t i = 0; i < ReservedRange::size; i++) { for (int32_t i = 0; i < ReservedRange::size; i++) {
add_texture(dummy_surface); add_texture(dummy_surface);
} }