From c867c22d855163ecbf18d5606b27c9d2cb50a148 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Fri, 10 Jun 2016 10:18:45 -0600 Subject: swr: [rasterizer core] stop single threaded crash exit crash Function static destructors were getting called by exit handlers before context teardown. Reviewed-by: Bruce Cherniak --- src/gallium/drivers/swr/rasterizer/core/api.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/swr/rasterizer') diff --git a/src/gallium/drivers/swr/rasterizer/core/api.cpp b/src/gallium/drivers/swr/rasterizer/core/api.cpp index 2e6f8b3a16d..22a94fbf731 100644 --- a/src/gallium/drivers/swr/rasterizer/core/api.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/api.cpp @@ -181,6 +181,8 @@ void WakeAllThreads(SWR_CONTEXT *pContext) pContext->FifosNotEmpty.notify_all(); } +static TileSet gSingleThreadLockedTiles; + template void QueueWork(SWR_CONTEXT *pContext) { @@ -213,10 +215,9 @@ void QueueWork(SWR_CONTEXT *pContext) if (IsDraw) { - static TileSet lockedTiles; uint64_t curDraw[2] = { pContext->pCurDrawContext->drawId, pContext->pCurDrawContext->drawId }; WorkOnFifoFE(pContext, 0, curDraw[0]); - WorkOnFifoBE(pContext, 0, curDraw[1], lockedTiles, 0, 0); + WorkOnFifoBE(pContext, 0, curDraw[1], gSingleThreadLockedTiles, 0, 0); } else { -- cgit v1.2.3