[[ ThreadedRendering ]] Implemented new stack surface API for Windows.

livecodemichael · livecodemichael · commit 2ab50763bdac · 2014-07-28T14:49:41.000+01:00
diff --git a/engine/kernel.vcproj b/engine/kernel.vcproj
@@ -574,6 +574,14 @@
 				RelativePath="src\stacklst.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\stacktile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\stacktile.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\stackview.cpp"
 				>
@@ -1499,6 +1507,13 @@
 			<File
 				RelativePath=".\src\quicktime.cpp"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<Filter
 				Name="Platform - Linux"
@@ -5100,6 +5115,10 @@
 				RelativePath=".\src\system.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\systhreads.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\sysunxdate.cpp"
 				>
@@ -5248,6 +5267,18 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\src\sysw32threads.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PrecompiledHeaderThrough="w32prefix.h"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="src\w32date.cpp"
 				>
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -2577,13 +2577,11 @@ void MCStack::view_surface_redrawwindow(MCStackSurface *p_surface, MCGRegionRef
                                                                 t_bounds . origin . y + t_bounds . size . height / 2,
                                                                 t_bounds . size . width - t_bounds . size . width / 2,
                                                                 t_bounds . size . height - t_bounds . size . height / 2));
-            MCLog("BEGIN TILE RENDERING", NULL);
             MCStackTilePush(&t_tile1);
             MCStackTilePush(&t_tile2);
             MCStackTilePush(&t_tile3);
             MCStackTilePush(&t_tile4);
             MCStackTileCollectAll();
-            MCLog("END TILE RENDERING", NULL);
         }
         else
         {
diff --git a/engine/src/stacktile.cpp b/engine/src/stacktile.cpp
@@ -29,7 +29,6 @@
 
 struct MCStackTileList
 {
-    uint32_t            index;
     MCStackTileList     *next;
     MCStackTile         *tile;
 };
@@ -79,7 +78,6 @@ void MCStackTileRender(void *p_ctxt)
     MCStackTileList *t_tile;
 	t_tile = (MCStackTileList *)p_ctxt;
     t_tile -> tile -> Render();
-    MCLog("TILE %d RENDERED", t_tile -> index);
     
     MCThreadMutexLock(s_main_thread_mutex);
     t_tile -> next = s_waiting_tiles;
@@ -108,7 +106,6 @@ void MCStackTilePush(MCStackTile *p_tile)
     t_tile = s_inactive_tiles;
     s_inactive_tiles = t_tile -> next;
     s_active_tile_count++;
-    t_tile -> index = s_active_tile_count;
     
     t_tile -> tile = p_tile;
     /* UNCHECKED */ MCThreadPoolPushTask(MCStackTileRender, (void *) t_tile);
@@ -131,7 +128,6 @@ void MCStackTileCollectAll(void)
             
             t_tile -> tile -> Unlock();
             t_tile -> tile = NULL;
-            MCLog("TILE %d COLLECTED", t_tile -> index);
             
             // Move the tile to the inactive list.
             t_tile -> next = s_inactive_tiles;
diff --git a/engine/src/sysw32threads.cpp b/engine/src/sysw32threads.cpp
@@ -79,9 +79,9 @@ DWORD WINAPI MCThreadPoolThreadExecute(LPVOID p_arg)
         if (s_task_list_start != NULL)
         {
             t_task = s_task_list_start;
-            s_task_list_start = t_task -> next;
-            
+            s_task_list_start = t_task -> next;            
             MCThreadMutexUnlock(s_task_mutex);
+
             t_task -> task(t_task -> context);
             MCMemoryDelete(t_task);
         }
@@ -173,8 +173,7 @@ bool MCThreadPoolPushTask(void (*p_task)(void*), void* p_context)
         t_task -> context = p_context;
         t_task -> next = NULL;
         
-        MCThreadMutexLock(s_task_mutex);
-        
+        MCThreadMutexLock(s_task_mutex);        
         if (s_task_list_start == NULL)
         {
             s_task_list_start = t_task;
@@ -184,8 +183,7 @@ bool MCThreadPoolPushTask(void (*p_task)(void*), void* p_context)
         {
             s_task_list_end -> next = t_task;
             s_task_list_end = t_task;
-        }
-        
+        }        
         MCThreadConditionSignal(s_task_condition);
         MCThreadMutexUnlock(s_task_mutex);
     }
@@ -289,7 +287,7 @@ bool MCThreadConditionCreate(MCThreadConditionRef &r_condition)
     
     if (t_success)
 	{
-		t_condition -> condition = CreateSemaphore(NULL, 10, 10, NULL);
+		t_condition -> condition = CreateSemaphore(NULL, 0, 10, NULL);
 		t_success = t_condition -> condition != NULL;
 	}
     
diff --git a/engine/src/w32misc.cpp b/engine/src/w32misc.cpp
@@ -323,15 +323,39 @@ void gdi_do_arc(HDC p_dc, HDC p_mask_dc, bool p_fill, int4 p_left, int4 p_top, i
 	}
 }
 
+static __declspec( thread ) bool s_initialized_on_thread = false;
+static __declspec( thread ) HDC s_theme_dc = NULL;
+
+static void MCThemeDCIntialize()
+{
+	if (s_initialized_on_thread)
+		return;
+
+	s_initialized_on_thread = true;
+	s_theme_dc = CreateCompatibleDC(NULL);
+}
+
+static void MCThemeDCFinalize()
+{
+	if (!s_initialized_on_thread)
+		return;
+
+	DeleteDC(s_theme_dc);
+	s_initialized_on_thread = false;
+}
+
 typedef void (*MCGDIDrawFunc)(HDC p_hdc, void *p_context);
 
 bool MCGDIDrawAlpha(uint32_t p_width, uint32_t p_height, MCGDIDrawFunc p_draw, void *p_context, MCImageBitmap *&r_bitmap)
 {
 	bool t_success = true;
 
+	MCThemeDCIntialize();
+
 	HDC t_dc;
 	//t_dc = CreateCompatibleDC(NULL);
-	t_dc = ((MCScreenDC*)MCscreen)->getdsthdc();
+	//t_dc = ((MCScreenDC*)MCscreen)->getdsthdc();
+	t_dc = s_theme_dc;
 	t_success = t_dc != nil;
 
 	bool t_alpha = false;
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
diff --git a/libgraphics/src/w32text.cpp b/libgraphics/src/w32text.cpp

Original file line number	Diff line number	Diff line change
`@@ -2577,13 +2577,11 @@ void MCStack::view_surface_redrawwindow(MCStackSurface *p_surface, MCGRegionRef`
`2577`	`2577`	`t_bounds . origin . y + t_bounds . size . height / 2,`
`2578`	`2578`	`t_bounds . size . width - t_bounds . size . width / 2,`
`2579`	`2579`	`t_bounds . size . height - t_bounds . size . height / 2));`
`2580`		`- MCLog("BEGIN TILE RENDERING", NULL);`
`2581`	`2580`	`MCStackTilePush(&t_tile1);`
`2582`	`2581`	`MCStackTilePush(&t_tile2);`
`2583`	`2582`	`MCStackTilePush(&t_tile3);`
`2584`	`2583`	`MCStackTilePush(&t_tile4);`
`2585`	`2584`	`MCStackTileCollectAll();`
`2586`		`- MCLog("END TILE RENDERING", NULL);`
`2587`	`2585`	`}`
`2588`	`2586`	`else`
`2589`	`2587`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,9 @@ DWORD WINAPI MCThreadPoolThreadExecute(LPVOID p_arg)`
`79`	`79`	`if (s_task_list_start != NULL)`
`80`	`80`	`{`
`81`	`81`	`t_task = s_task_list_start;`
`82`		`- s_task_list_start = t_task -> next;`
`83`		`-`
	`82`	`+ s_task_list_start = t_task -> next;`
`84`	`83`	`MCThreadMutexUnlock(s_task_mutex);`
	`84`	`+`
`85`	`85`	`t_task -> task(t_task -> context);`
`86`	`86`	`MCMemoryDelete(t_task);`
`87`	`87`	`}`
`@@ -173,8 +173,7 @@ bool MCThreadPoolPushTask(void (p_task)(void), void* p_context)`
`173`	`173`	`t_task -> context = p_context;`
`174`	`174`	`t_task -> next = NULL;`
`175`	`175`
`176`		`- MCThreadMutexLock(s_task_mutex);`
`177`		`-`
	`176`	`+ MCThreadMutexLock(s_task_mutex);`
`178`	`177`	`if (s_task_list_start == NULL)`
`179`	`178`	`{`
`180`	`179`	`s_task_list_start = t_task;`
`@@ -184,8 +183,7 @@ bool MCThreadPoolPushTask(void (p_task)(void), void* p_context)`
`184`	`183`	`{`
`185`	`184`	`s_task_list_end -> next = t_task;`
`186`	`185`	`s_task_list_end = t_task;`
`187`		`- }`
`188`		`-`
	`186`	`+ }`
`189`	`187`	`MCThreadConditionSignal(s_task_condition);`
`190`	`188`	`MCThreadMutexUnlock(s_task_mutex);`
`191`	`189`	`}`
`@@ -289,7 +287,7 @@ bool MCThreadConditionCreate(MCThreadConditionRef &r_condition)`
`289`	`287`
`290`	`288`	`if (t_success)`
`291`	`289`	`{`
`292`		`- t_condition -> condition = CreateSemaphore(NULL, 10, 10, NULL);`
	`290`	`+ t_condition -> condition = CreateSemaphore(NULL, 0, 10, NULL);`
`293`	`291`	`t_success = t_condition -> condition != NULL;`
`294`	`292`	`}`
`295`	`293`