revert begin/endrefresh image avoidance - this isn't the cause of the simplerefresh damage region deadlock

This commit is contained in:
Chris Young 2012-08-05 23:06:01 +01:00
parent 6d602b103e
commit 1ef7336f22
3 changed files with 2 additions and 9 deletions

View File

@ -3562,7 +3562,6 @@ void ami_refresh_window(struct gui_window_2 *gwin)
GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox);
browserglob.locked_layers = true;
BeginRefresh(gwin->win);
x0 = ((gwin->win->RPort->Layer->DamageList->bounds.MinX - bbox->Left) /
@ -3595,7 +3594,6 @@ void ami_refresh_window(struct gui_window_2 *gwin)
}
EndRefresh(gwin->win, TRUE);
browserglob.locked_layers = false;
}
void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)

View File

@ -194,8 +194,6 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
gg->surface = cairo_amigaos_surface_create(gg->rp->BitMap);
gg->cr = cairo_create(gg->surface);
#endif
gg->locked_layers = false;
}
void ami_free_layers(struct gui_globals *gg)
@ -650,8 +648,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma
if(palette_mapped == false) {
tbm = ami_getcachenativebm(bitmap, width, height, glob->rp->BitMap);
} else {
if(glob->locked_layers == false)
tbm = ami_bitmap_get_palettemapped(bitmap, width, height);
tbm = ami_bitmap_get_palettemapped(bitmap, width, height);
}
if(!tbm) return true;
@ -740,8 +737,7 @@ bool ami_bitmap_tile(int x, int y, int width, int height,
if(palette_mapped == false) {
tbm = ami_getcachenativebm(bitmap,width,height,glob->rp->BitMap);
} else {
if(glob->locked_layers == false)
tbm = ami_bitmap_get_palettemapped(bitmap, width, height);
tbm = ami_bitmap_get_palettemapped(bitmap, width, height);
}
if(!tbm) return true;

View File

@ -34,7 +34,6 @@ struct gui_globals
APTR tmprasbuf;
struct Rectangle rect;
struct MinList *shared_pens;
bool locked_layers;
#ifdef NS_AMIGA_CAIRO
cairo_surface_t *surface;
cairo_t *cr;