From 29d07480b8e7b8e5529e6a824b7d99e9677a1816 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Thu, 13 Oct 2016 20:56:54 -0500 Subject: [PATCH] swr: [rasterizer core] remove WorkerWaitForThreadEvent bucket Cause of bucket stop capture hang, as threads get stuck in level 1. Signed-off-by: Tim Rowley --- src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp | 1 - src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h | 1 - src/gallium/drivers/swr/rasterizer/core/threads.cpp | 4 ---- 3 files changed, 6 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp b/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp index 56eed25f959..99b9f55ed12 100644 --- 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 11b3eaed5f4..733ee18d5f1 100644 --- 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 a8864c7d7bc..ea5542ab332 100644 --- 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)