MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor scissor test handling for macOS and others

Browse Source
This commit is contained in:
Antonis Geralis 2025-12-19 14:55:48 +02:00 committed by GitHub
parent 70e6b3b961
commit 568e195ca4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/rcore.c
View File

@ -1093,27 +1093,40 @@ void BeginScissorMode(int x, int y, int width, int height)
rlEnableScissorTest(); rlEnableScissorTest();
#if !defined(__APPLE__) #if defined(__APPLE__)
if (!CORE.Window.usingFbo && // macOS: keep existing behavior (native scaling behavior differs)
(CORE.Window.screen.width > 0) && (CORE.Window.screen.height > 0)) if (!CORE.Window.usingFbo)
{ {
const float sx = (float)CORE.Window.currentFbo.width/(float)CORE.Window.screen.width; Vector2 scale = GetWindowScaleDPI();
const float sy = (float)CORE.Window.currentFbo.height/(float)CORE.Window.screen.height; rlScissor((int)(x*scale.x),
(int)(GetScreenHeight()*scale.y - (((y + height)*scale.y))),
if ((sx != 1.0f) || (sy != 1.0f)) (int)(width*scale.x),
{ (int)(height*scale.y));
rlScissor((int)(x*sx),
(int)(CORE.Window.currentFbo.height - (y + height)*sy),
(int)(width*sx),
(int)(height*sy));
}
else rlScissor(x, CORE.Window.currentFbo.height - (y + height), width, height);
} }
#endif
else else
{ {
rlScissor(x, CORE.Window.currentFbo.height - (y + height), width, height); rlScissor(x, CORE.Window.currentFbo.height - (y + height), width, height);
} }
#else
// Non-Apple: scissor is in framebuffer pixels, but API coords are logical screen coords.
// Use the actual framebuffer-to-window ratio (works for Wayland fractional scaling even when HIGHDPI flag is off).
if (!CORE.Window.usingFbo &&
(CORE.Window.screen.width > 0) && (CORE.Window.screen.height > 0) &&
(CORE.Window.currentFbo.width > 0) && (CORE.Window.currentFbo.height > 0))
{
const float sx = (float)CORE.Window.currentFbo.width/(float)CORE.Window.screen.width;
const float sy = (float)CORE.Window.currentFbo.height/(float)CORE.Window.screen.height;
rlScissor((int)(x*sx),
(int)(CORE.Window.currentFbo.height - (y + height)*sy),
(int)(width*sx),
(int)(height*sy));
}
else
{
rlScissor(x, CORE.Window.currentFbo.height - (y + height), width, height);
}
#endif
} }
// End scissor mode // End scissor mode