swr: [rasterizer core] remove WorkerWaitForThreadEvent bucket

Cause of bucket stop capture hang, as threads get stuck in level 1.

Signed-off-by: Tim Rowley <timothy.o.rowley@intel.com>

diff --git a/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp b/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp
index 56eed25f959c0f11f84ee22ff687b5b351c7ea05..99b9f55ed12f08caf9d17d3b196612c53b04e943 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp
@@ -85,7 +85,6 @@ BUCKET_DESC gCoreBuckets[] = {
     { "BEOutputMerger", "", false, 0xffffffff },
     { "BEStoreTiles", "", true, 0xff00cccc },
     { "BEEndTile", "", false, 0xffffffff },
-    { "WorkerWaitForThreadEvent", "", false, 0xffffffff },
 };
 
 /// @todo bucketmanager and mapping should probably be a part of the SWR context

diff --git a/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h b/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h
index 11b3eaed5f4b801076aab002d26f82d5e1f233c0..733ee18d5f1e96be742e9a1ffbbc7e62272798b7 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h
+++ b/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h
@@ -90,7 +90,6 @@ enum CORE_BUCKETS
     BEOutputMerger,
     BEStoreTiles,
     BEEndTile,
-    WorkerWaitForThreadEvent,
 
     NumBuckets
 };

diff --git a/src/gallium/drivers/swr/rasterizer/core/threads.cpp b/src/gallium/drivers/swr/rasterizer/core/threads.cpp
index a8864c7d7bc353fa8075c33a28e498d59b059431..ea5542ab3320d3170c59cf9e0baa93554f006c8b 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/threads.cpp
+++ b/src/gallium/drivers/swr/rasterizer/core/threads.cpp
@@ -761,12 +761,8 @@ DWORD workerThreadMain(LPVOID pData)
                 continue;
             }
 
-            AR_BEGIN(WorkerWaitForThreadEvent, 0);
-
             pContext->FifosNotEmpty.wait(lock);
             lock.unlock();
-
-            AR_END(WorkerWaitForThreadEvent, 0);
         }
 
         if (IsBEThread)