ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renderer: fix scissoring with hscale, pixel_double, vscale... 

Fixes Wacky Races, ECW Hardcore and Cho - Hatsumei Boy Kanipan cropped
screen
This commit is contained in:
Flyinghead 2019-11-18 15:57:18 +01:00
parent a4053715af
commit 2c26d379df
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/rend/transform_matrix.h
View File

@ -139,7 +139,7 @@ public:
* glm::scale(glm::vec3(x_coef, y_coef, 1.f))
* normalMatrix;
scissorMatrix = trans_rot
* glm::scale(glm::vec3(x_coef / scale_x * scissoring_scale_x, y_coef / scale_y * scissoring_scale_y, 1.f))
* glm::scale(glm::vec3(x_coef * scissoring_scale_x, y_coef * scissoring_scale_y, 1.f))
* scissorMatrix;
}
else
@ -152,7 +152,7 @@ public:
* glm::scale(glm::vec3(x_coef, y_coef, 1.f))
* normalMatrix;
scissorMatrix = glm::translate(glm::vec3(-1 + 2 * sidebarWidth / screen_width, invertY ? 1 : -1, 0))
* glm::scale(glm::vec3(x_coef / scale_x * scissoring_scale_x, y_coef / scale_y * scissoring_scale_y, 1.f))
* glm::scale(glm::vec3(x_coef * scissoring_scale_x, y_coef * scissoring_scale_y, 1.f))
* scissorMatrix;
}
}
@ -183,8 +183,11 @@ private:
if (!renderingContext->isRTT && !renderingContext->isRenderFramebuffer)
{
scale_x = fb_scale_x;
scale_y = fb_scale_y;
if (!scissor)
{
scale_x = fb_scale_x;
scale_y = fb_scale_y;
}
if (SCALER_CTL.vscalefactor > 0x400)
{
// Interlace mode A (single framebuffer)
@ -197,12 +200,12 @@ private:
// VO pixel doubling is done after fb rendering/clipping
// so it should be used for scissoring as well
if (VO_CONTROL.pixel_double)
if (VO_CONTROL.pixel_double && !scissor)
scale_x *= 0.5f;
// the X Scaler halves the horizontal resolution but
// before clipping/scissoring
if (SCALER_CTL.hscale && !scissor)
if (SCALER_CTL.hscale)
scale_x *= 2.f;
}
}