zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-04 09:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The scissor rectangle must be clipped to the upper left edge of the screen.

Browse source 
Negative coordinates are treated as "disable scissor", so if some transformation results in something off-screen it needs to be handled before passing it to the backend.
This commit is contained in:
Christoph Oelckers 2020-06-11 12:40:11 +02:00
parent 3e7061036a
commit 95c232d31a
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/rendering/hwrenderer/hw_draw2d.cpp
View file

@ -150,6 +150,9 @@ void Draw2D(F2DDrawer *drawer, FRenderState &state)
sciY = screen->ScreenToWindowY(cmd.mScissor[3]); sciY = screen->ScreenToWindowY(cmd.mScissor[3]);
sciW = screen->ScreenToWindowX(cmd.mScissor[2]) - sciX; sciW = screen->ScreenToWindowX(cmd.mScissor[2]) - sciX;
sciH = screen->ScreenToWindowY(cmd.mScissor[1]) - sciY; sciH = screen->ScreenToWindowY(cmd.mScissor[1]) - sciY;
// If coordinates turn out negative, clip to sceen here to avoid undefined behavior.
if (sciX < 0) sciW += sciX, sciX = 0;
if (sciY < 0) sciH += sciY, sciY = 0;
} }
else else
{ {

1
src/common/textures/texturemanager.h
View file

@ -11,7 +11,6 @@ class FxAddSub;
struct BuildInfo; struct BuildInfo;
class FMultipatchTextureBuilder; class FMultipatchTextureBuilder;
class FScanner; class FScanner;
int PalCheck(int tex);
// Texture manager // Texture manager
class FTextureManager class FTextureManager