Skip to content

Fix ABC aspect handling in keep-aspect mode #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhgqfqxzdm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix ABC aspect handling in keep-aspect mode #33

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a157eb
Fix ABC Windows aspect handling
May 17, 2026
e30ac0a
Limit ABC keep-aspect blit sizing to Windows
May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 44 additions & 7 deletions src/loader/graphics/blitStretching.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ void initBlitting()

void blitSetWidthandHeightSize()
{
EmulatorConfig *config = getConfig();

if (gGrp == GROUP_ID4_EXP || gGrp == GROUP_ID4_JAP || gGrp == GROUP_ID5)
{
if (isTestMode())
Expand All @@ -76,6 +78,13 @@ void blitSetWidthandHeightSize()
blitWidth = 640;
blitHeight = 480;
}
#ifdef _WIN32
else if (gGrp == GROUP_ABC && config->keepAspectRatio)
{
blitWidth = 640;
blitHeight = 480;
}
#endif
else if (gId == QUIZ_AXA_SBMS || gId == QUIZ_AXA_SBUR_LIVE || gId == MJ4_SBPN_REVG || gId == MJ4_EVO_SBTA)
{
blitWidth = 1024;
Expand Down Expand Up @@ -189,17 +198,45 @@ void blitStretch()

glad_glReadBuffer(GL_BACK);
CHECK_GL("readbuffer GL_BACK");

glad_glBlitFramebuffer(0, 0, blitWidth, blitHeight, 0, 0, blitWidth, blitHeight, GL_COLOR_BUFFER_BIT, GL_NEAREST);
CHECK_GL("first blit to fboId");

#ifdef _WIN32
GLint vp[4];
glad_glGetIntegerv(GL_VIEWPORT, vp);
#endif

#ifdef _WIN32
if (gGrp == GROUP_ABC && vp[2] > blitWidth && vp[3] > blitHeight)
{
glad_glBlitFramebuffer(
vp[0], vp[1],
vp[0] + vp[2], vp[1] + vp[3],
0, 0,
blitWidth, blitHeight,
GL_COLOR_BUFFER_BIT,
GL_NEAREST
);
}
else
#endif
{
glad_glBlitFramebuffer(
0, 0,
blitWidth, blitHeight,
0, 0,
blitWidth, blitHeight,
GL_COLOR_BUFFER_BIT,
GL_NEAREST
);
}
CHECK_GL("first blit to fboId");

float gameAspect = (float)blitWidth / (float)blitHeight;
float windowAspect = (float)drawableW / (float)drawableH;
float windowAspect = (float)drawableW / (float)drawableH;

dest.W = drawableW;
dest.H = drawableH;

if (windowAspect > gameAspect)
if (windowAspect > gameAspect)
{
dest.W = (GLsizei)(drawableH * gameAspect);
dest.X = (drawableW - dest.W) / 2;
Expand All @@ -209,7 +246,7 @@ void blitStretch()
dest.H = (GLsizei)(drawableW / gameAspect);
dest.Y = (drawableH - dest.H) / 2;
}

glad_glBindFramebuffer(GL_FRAMEBUFFER, 0);
CHECK_GL("bind default framebuffer");

Expand Down Expand Up @@ -260,4 +297,4 @@ void blitStretch()

glad_glClearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], oldClearColor[3]);
}
}
}