isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-20 22:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Align cache destruction callback in software renderer (#284)

Browse Source
This commit is contained in:
Anders Jenbo 2025-06-12 01:45:07 +02:00 committed by GitHub
parent d06972cfb5
commit 4374453cb7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
miniwin/src/d3drm/backends/software/renderer.cpp
View File

@ -436,18 +436,18 @@ void Direct3DRMSoftwareRenderer::DrawTriangleProjected(
} }
} }
struct TextureDestroyContext { struct CacheDestroyContext {
Direct3DRMSoftwareRenderer* renderer; Direct3DRMSoftwareRenderer* renderer;
Uint32 textureId; Uint32 id;
}; };
void Direct3DRMSoftwareRenderer::AddTextureDestroyCallback(Uint32 id, IDirect3DRMTexture* texture) void Direct3DRMSoftwareRenderer::AddTextureDestroyCallback(Uint32 id, IDirect3DRMTexture* texture)
{ {
auto* ctx = new TextureDestroyContext{this, id}; auto* ctx = new CacheDestroyContext{this, id};
texture->AddDestroyCallback( texture->AddDestroyCallback(
[](IDirect3DRMObject* obj, void* arg) { [](IDirect3DRMObject* obj, void* arg) {
auto* ctx = static_cast<TextureDestroyContext*>(arg); auto* ctx = static_cast<CacheDestroyContext*>(arg);
auto& cacheEntry = ctx->renderer->m_textures[ctx->textureId]; auto& cacheEntry = ctx->renderer->m_textures[ctx->id];
if (cacheEntry.cached) { if (cacheEntry.cached) {
SDL_UnlockSurface(cacheEntry.cached); SDL_UnlockSurface(cacheEntry.cached);
SDL_DestroySurface(cacheEntry.cached); SDL_DestroySurface(cacheEntry.cached);
@ -525,18 +525,18 @@ MeshCache UploadMesh(const MeshGroup& meshGroup)
return cache; return cache;
} }
struct MeshDestroyContext {
Direct3DRMSoftwareRenderer* renderer;
Uint32 id;
};
void Direct3DRMSoftwareRenderer::AddMeshDestroyCallback(Uint32 id, IDirect3DRMMesh* mesh) void Direct3DRMSoftwareRenderer::AddMeshDestroyCallback(Uint32 id, IDirect3DRMMesh* mesh)
{ {
auto* ctx = new MeshDestroyContext{this, id}; auto* ctx = new CacheDestroyContext{this, id};
mesh->AddDestroyCallback( mesh->AddDestroyCallback(
[](IDirect3DRMObject*, void* arg) { [](IDirect3DRMObject* obj, void* arg) {
auto* ctx = static_cast<MeshDestroyContext*>(arg); auto* ctx = static_cast<CacheDestroyContext*>(arg);
ctx->renderer->m_meshs[ctx->id].meshGroup = nullptr; auto& cacheEntry = ctx->renderer->m_meshs[ctx->id];
if (cacheEntry.meshGroup) {
cacheEntry.meshGroup = nullptr;
cacheEntry.vertices.clear();
cacheEntry.indices.clear();
}
delete ctx; delete ctx;
}, },
ctx ctx