marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Use a binary search to generate the clipped rects. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Huw Davies 2016-07-06 11:09:12 +01:00 committed by Alexandre Julliard
parent 49078e00a5
commit 7fd44a511f
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/dibdrv/dc.c
View File

@ -280,7 +280,7 @@ int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct cl
if (!(region = get_wine_region( clip ))) return 0;
for (i = 0; i < region->numRects; i++)
for (i = region_find_pt( region, rect.left, rect.top, NULL ); i < region->numRects; i++)
{
if (region->rects[i].top >= rect.bottom) break;
if (!intersect_rect( out, &rect, &region->rects[i] )) continue;

33
dlls/gdi32/gdi_private.h
View File

@ -370,6 +370,39 @@ static inline void release_wine_region(HRGN rgn)
GDI_ReleaseObj(rgn);
}
/**********************************************************
* region_find_pt
*
* Return either the index of the rectangle that contains (x,y) or the first
* rectangle after it. Sets *hit to TRUE if the region contains (x,y).
* Note if (x,y) follows all rectangles, then the return value will be rgn->numRects.
*/
static inline int region_find_pt( const WINEREGION *rgn, int x, int y, BOOL *hit )
{
int i, start = 0, end = rgn->numRects - 1;
BOOL h = FALSE;
while (start <= end)
{
i = (start + end) / 2;
if (rgn->rects[i].bottom <= y ||
(rgn->rects[i].top <= y && rgn->rects[i].right <= x))
start = i + 1;
else if (rgn->rects[i].top > y ||
(rgn->rects[i].bottom > y && rgn->rects[i].left > x))
end = i - 1;
else
{
h = TRUE;
break;
}
}
if (hit) *hit = h;
return h ? i : start;
}
/* null driver entry points */
extern BOOL nulldrv_AbortPath( PHYSDEV dev ) DECLSPEC_HIDDEN;
extern BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst,