TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

SDL_GPU: Fix transitions on scenes with 2D overlay (#529)

Browse Source
This commit is contained in:
Anders Jenbo 2025-07-06 00:01:21 +02:00 committed by GitHub
parent 9862705232
commit 6b446d242f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
miniwin/src/d3drm/backends/sdl3gpu/renderer.cpp
View File

@ -1009,7 +1009,7 @@ void Direct3DRMSDL3GPURenderer::Download(SDL_Surface* target)
} }
SDL_Surface* renderedImage = SDL_Surface* renderedImage =
SDL_CreateSurfaceFrom(width, height, SDL_PIXELFORMAT_ARGB8888, downloadedData, width * 4); SDL_CreateSurfaceFrom(width, height, SDL_PIXELFORMAT_XRGB8888, downloadedData, width * 4);
SDL_BlitSurfaceScaled(renderedImage, nullptr, target, nullptr, SDL_SCALEMODE_NEAREST); SDL_BlitSurfaceScaled(renderedImage, nullptr, target, nullptr, SDL_SCALEMODE_NEAREST);
SDL_DestroySurface(renderedImage); SDL_DestroySurface(renderedImage);

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

@ -761,10 +761,9 @@ void Direct3DRMSoftwareRenderer::Resize(int width, int height, const ViewportTra
void Direct3DRMSoftwareRenderer::Clear(float r, float g, float b) void Direct3DRMSoftwareRenderer::Clear(float r, float g, float b)
{ {
SDL_Rect rect = {0, 0, m_renderedImage->w, m_renderedImage->h};
const SDL_PixelFormatDetails* details = SDL_GetPixelFormatDetails(m_renderedImage->format); const SDL_PixelFormatDetails* details = SDL_GetPixelFormatDetails(m_renderedImage->format);
Uint32 color = SDL_MapRGB(details, m_palette, r * 255, g * 255, b * 255); Uint32 color = SDL_MapRGB(details, m_palette, r * 255, g * 255, b * 255);
SDL_FillSurfaceRect(m_renderedImage, &rect, color); SDL_FillSurfaceRect(m_renderedImage, nullptr, color);
} }
void Direct3DRMSoftwareRenderer::Flip() void Direct3DRMSoftwareRenderer::Flip()

3
miniwin/src/ddraw/framebuffer.cpp
View File

@ -172,11 +172,10 @@ HRESULT FrameBufferImpl::Lock(LPRECT lpDestRect, DDSURFACEDESC* lpDDSurfaceDesc,
return DDERR_GENERIC; return DDERR_GENERIC;
} }
if ((dwFlags & DDLOCK_WRITEONLY) == DDLOCK_WRITEONLY) { if ((dwFlags & DDLOCK_WRITEONLY) == DDLOCK_WRITEONLY) {
SDL_Rect rect = {0, 0, m_transferBuffer->m_surface->w, m_transferBuffer->m_surface->h};
const SDL_PixelFormatDetails* details = SDL_GetPixelFormatDetails(m_transferBuffer->m_surface->format); const SDL_PixelFormatDetails* details = SDL_GetPixelFormatDetails(m_transferBuffer->m_surface->format);
SDL_Palette* palette = m_palette ? static_cast<DirectDrawPaletteImpl*>(m_palette)->m_palette : nullptr; SDL_Palette* palette = m_palette ? static_cast<DirectDrawPaletteImpl*>(m_palette)->m_palette : nullptr;
Uint32 color = SDL_MapRGBA(details, palette, 0, 0, 0, 0); Uint32 color = SDL_MapRGBA(details, palette, 0, 0, 0, 0);
SDL_FillSurfaceRect(m_transferBuffer->m_surface, &rect, color); SDL_FillSurfaceRect(m_transferBuffer->m_surface, nullptr, color);
} }
else { else {
DDRenderer->Download(m_transferBuffer->m_surface); DDRenderer->Download(m_transferBuffer->m_surface);