ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move scissor test reverse code to gl drivers

Browse Source
This commit is contained in:
Benau 2021-04-21 07:56:37 +08:00
parent 62bf288530
commit f3d8b96149
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/irrlicht/source/Irrlicht/COGLES2Driver.cpp
View File

@ -2706,8 +2706,14 @@ namespace video
void COGLES2Driver::enableScissorTest(const core::rect<s32>& r) void COGLES2Driver::enableScissorTest(const core::rect<s32>& r)
{ {
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glScissor(r.UpperLeftCorner.X, r.UpperLeftCorner.Y, // The x​ and y​ is the window-space lower-left position of the scissor box,
r.getWidth(), r.getHeight()); // and width​ and height​ define the size of the rectangle.
s32 y = (s32)getCurrentRenderTargetSize().Height - r.LowerRightCorner.Y;
core::rect<s32> rect_reverse(r.UpperLeftCorner.X, y,
r.UpperLeftCorner.X + r.getWidth(),
y + r.getHeight());
glScissor(rect_reverse.UpperLeftCorner.X, rect_reverse.UpperLeftCorner.Y,
rect_reverse.getWidth(), rect_reverse.getHeight());
} }
void COGLES2Driver::disableScissorTest() void COGLES2Driver::disableScissorTest()

10
lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
View File

@ -4942,8 +4942,14 @@ GLenum COpenGLDriver::getZBufferBits() const
void COpenGLDriver::enableScissorTest(const core::rect<s32>& r) void COpenGLDriver::enableScissorTest(const core::rect<s32>& r)
{ {
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glScissor(r.UpperLeftCorner.X, r.UpperLeftCorner.Y, // The x​ and y​ is the window-space lower-left position of the scissor box,
r.getWidth(), r.getHeight()); // and width​ and height​ define the size of the rectangle.
s32 y = (s32)getCurrentRenderTargetSize().Height - r.LowerRightCorner.Y;
core::rect<s32> rect_reverse(r.UpperLeftCorner.X, y,
r.UpperLeftCorner.X + r.getWidth(),
y + r.getHeight());
glScissor(rect_reverse.UpperLeftCorner.X, rect_reverse.UpperLeftCorner.Y,
rect_reverse.getWidth(), rect_reverse.getHeight());
} }
void COpenGLDriver::disableScissorTest() void COpenGLDriver::disableScissorTest()

10
src/font/font_drawer.cpp
View File

@ -164,15 +164,7 @@ void FontDrawer::draw()
} }
if (g_clip) if (g_clip)
{ irr_driver->getVideoDriver()->enableScissorTest(*g_clip);
const core::dimension2d<u32>& render_target_size =
irr_driver->getActualScreenSize();
s32 y = (s32)render_target_size.Height - g_clip->LowerRightCorner.Y;
core::rect<s32> r(g_clip->UpperLeftCorner.X, y,
g_clip->UpperLeftCorner.X + g_clip->getWidth(),
y + g_clip->getHeight());
irr_driver->getVideoDriver()->enableScissorTest(r);
}
else else
irr_driver->getVideoDriver()->disableScissorTest(); irr_driver->getVideoDriver()->disableScissorTest();