From: Toni Wilen <twilen@winuae.net>
Date: Sat, 10 Feb 2018 18:06:26 +0000 (+0200)
Subject: Stop background render thread if not needed.
X-Git-Tag: 4000~193
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=a43d9a5d728e5473782f2b7e0d2a36558c89d798;p=francis%2Fwinuae.git

Stop background render thread if not needed.
---

diff --git a/devices.cpp b/devices.cpp
index 942cfa0d..ef13a385 100644
--- a/devices.cpp
+++ b/devices.cpp
@@ -337,6 +337,7 @@ void do_leave_program (void)
 	// must be first
 	uae_ppc_free();
 #endif
+	picasso_free();
 	free_traps();
 	sampler_free ();
 	graphics_leave ();
diff --git a/od-win32/picasso96_win.cpp b/od-win32/picasso96_win.cpp
index e73b59c9..cb6aa220 100644
--- a/od-win32/picasso96_win.cpp
+++ b/od-win32/picasso96_win.cpp
@@ -96,6 +96,7 @@ static int p96syncrate;
 static int p96hsync_counter, full_refresh;
 
 static smp_comm_pipe *render_pipe;
+static volatile int render_thread_state;
 static CRITICAL_SECTION render_cs;
 
 #define PICASSO_STATE_SETDISPLAY 1
@@ -4617,14 +4618,18 @@ static bool picasso_flushpixels (int index, uae_u8 *src, int off)
 
 static void *render_thread(void *v)
 {
+	render_thread_state = 1;
 	for (;;) {
 		int idx = read_comm_pipe_int_blocking(render_pipe);
 		if (idx == -1)
 			break;
-		lockrtg();
-		picasso_flushpixels(idx, gfxmem_banks[idx]->start + natmem_offset, picasso96_state.XYOffset - gfxmem_banks[idx]->start);
-		unlockrtg();
+		if (picasso_on && picasso_requested_on) {
+			lockrtg();
+			picasso_flushpixels(idx, gfxmem_banks[idx]->start + natmem_offset, picasso96_state.XYOffset - gfxmem_banks[idx]->start);
+			unlockrtg();
+		}
 	}
+	render_thread_state = -1;
 	return 0;
 }
 
@@ -5009,11 +5014,16 @@ static void inituaegfxfuncs(TrapContext *ctx, uaecptr start, uaecptr ABI)
 
 void picasso_reset (void)
 {
-	if (!render_pipe && currprefs.rtg_multithread) {
-		InitializeCriticalSection(&render_cs);
-		render_pipe = xmalloc(smp_comm_pipe, 1);
-		init_comm_pipe(render_pipe, 10, 1);
-		uae_start_thread(_T("rtg"), render_thread, NULL, NULL);
+	if (currprefs.rtg_multithread) {
+		if (!render_pipe) {
+			InitializeCriticalSection(&render_cs);
+			render_pipe = xmalloc(smp_comm_pipe, 1);
+			init_comm_pipe(render_pipe, 10, 1);
+		}
+		if (render_thread_state <= 0) {
+			render_thread_state = 0;
+			uae_start_thread(_T("rtg"), render_thread, NULL, NULL);
+		}
 	}
 
 	rtg_index = -1;
@@ -5199,6 +5209,17 @@ uae_u32 picasso_demux (uae_u32 arg, TrapContext *ctx)
 	return 0;
 }
 
+void picasso_free(void)
+{
+	if (currprefs.rtg_multithread && render_thread_state > 0) {
+		write_comm_pipe_int(render_pipe, -1, 0);
+		while (render_thread_state >= 0) {
+			Sleep(10);
+		}
+		render_thread_state = 0;
+	}
+}
+
 void restore_p96_finish (void)
 {
 	init_alloc (NULL, 0);
diff --git a/od-win32/picasso96_win.h b/od-win32/picasso96_win.h
index a6dca7ce..6c13b2c6 100644
--- a/od-win32/picasso96_win.h
+++ b/od-win32/picasso96_win.h
@@ -563,6 +563,7 @@ extern void picasso_getwritewatch (int index, int offset);
 extern bool picasso_is_vram_dirty (int index, uaecptr addr, int size);
 extern void picasso_statusline (uae_u8 *dst);
 extern void picasso_invalidate (int x, int y, int w, int h);
+extern void picasso_free(void);
 
 /* This structure describes the UAE-side framebuffer for the Picasso
  * screen.  */