dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't split viewport draw chunks

Browse Source 
The stated explanation seems unconvincing, and it introduces a performance penalty.
This commit is contained in:
Jonathan G Rennison
2018-01-18 18:42:09 +00:00
parent 83e6cf50a0
commit d82f9b50c6
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/viewport.cpp
View File

@@ -2614,30 +2614,14 @@ void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom
_vd.child_screen_sprites_to_draw.Clear(); _vd.child_screen_sprites_to_draw.Clear();
} }
/**
* Make sure we don't draw a too big area at a time.
* If we do, the sprite memory will overflow.
*/
static void ViewportDrawChk(const ViewPort *vp, int left, int top, int right, int bottom) static void ViewportDrawChk(const ViewPort *vp, int left, int top, int right, int bottom)
{ {
if ((vp->zoom < ZOOM_LVL_DRAW_MAP) && (ScaleByZoom(bottom - top, vp->zoom) * ScaleByZoom(right - left, vp->zoom) > 180000 * ZOOM_LVL_BASE * ZOOM_LVL_BASE)) { ViewportDoDraw(vp,
if ((bottom - top) > (right - left)) { ScaleByZoom(left - vp->left, vp->zoom) + vp->virtual_left,
int t = (top + bottom) >> 1; ScaleByZoom(top - vp->top, vp->zoom) + vp->virtual_top,
ViewportDrawChk(vp, left, top, right, t); ScaleByZoom(right - vp->left, vp->zoom) + vp->virtual_left,
ViewportDrawChk(vp, left, t, right, bottom); ScaleByZoom(bottom - vp->top, vp->zoom) + vp->virtual_top
} else { );
int t = (left + right) >> 1;
ViewportDrawChk(vp, left, top, t, bottom);
ViewportDrawChk(vp, t, top, right, bottom);
}
} else {
ViewportDoDraw(vp,
ScaleByZoom(left - vp->left, vp->zoom) + vp->virtual_left,
ScaleByZoom(top - vp->top, vp->zoom) + vp->virtual_top,
ScaleByZoom(right - vp->left, vp->zoom) + vp->virtual_left,
ScaleByZoom(bottom - vp->top, vp->zoom) + vp->virtual_top
);
}
} }
static inline void ViewportDraw(const ViewPort *vp, int left, int top, int right, int bottom) static inline void ViewportDraw(const ViewPort *vp, int left, int top, int right, int bottom)