From 56b5a5c4f06f5b892c211e23dfb89c2e9a067068 Mon Sep 17 00:00:00 2001 From: gulrak Date: Mon, 6 Nov 2023 19:03:12 +0100 Subject: [PATCH] BeginScissorMode checks for render texture to avoid using GetWindowScaleDPI (#3510) --- src/rcore.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/rcore.c b/src/rcore.c index 0e7927f03..adad7e43c 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -1088,20 +1088,25 @@ void BeginScissorMode(int x, int y, int width, int height) rlEnableScissorTest(); + GLint id = 0; + glGetIntegerv(GL_FRAMEBUFFER_BINDING, &id); // Test for render texture #if defined(__APPLE__) - Vector2 scale = GetWindowScaleDPI(); - rlScissor((int)(x*scale.x), (int)(GetScreenHeight()*scale.y - (((y + height)*scale.y))), (int)(width*scale.x), (int)(height*scale.y)); + if(!id) + { + Vector2 scale = GetWindowScaleDPI(); + rlScissor((int)(x*scale.x), (int)(GetScreenHeight()*scale.y - (((y + height)*scale.y))), (int)(width*scale.x), (int)(height*scale.y)); + } #else - if ((CORE.Window.flags & FLAG_WINDOW_HIGHDPI) > 0) + if (!id && (CORE.Window.flags & FLAG_WINDOW_HIGHDPI) > 0) { Vector2 scale = GetWindowScaleDPI(); rlScissor((int)(x*scale.x), (int)(CORE.Window.currentFbo.height - (y + height)*scale.y), (int)(width*scale.x), (int)(height*scale.y)); } +#endif else { rlScissor(x, CORE.Window.currentFbo.height - (y + height), width, height); } -#endif } // End scissor mode