From 1ef7336f22c5751f8dd35c60d2e34fe0f49af455 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 5 Aug 2012 23:06:01 +0100
Subject: revert begin/endrefresh image avoidance - this isn't the cause of the
 simplerefresh damage region deadlock

---
 amiga/gui.c      | 2 --
 amiga/plotters.c | 8 ++------
 amiga/plotters.h | 1 -
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'amiga')

diff --git a/amiga/gui.c b/amiga/gui.c
index 03ca8a9b8..5d1452142 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -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)
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 3aef04344..cdd5aac7a 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -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;
diff --git a/amiga/plotters.h b/amiga/plotters.h
index b51aad2b0..94dfaee6e 100755
--- a/amiga/plotters.h
+++ b/amiga/plotters.h
@@ -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;
-- 
cgit v1.2.3