From c18d91ca9aa4911a258fb164cab1ed92e781baea Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Mon, 24 Jul 2017 18:25:51 -0500 Subject: [PATCH] swr/rast: rename frontend pVertexStore Rename to reflect global nature. Reviewed-by: Bruce Cherniak --- .../drivers/swr/rasterizer/core/frontend.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp index f9eda839cc3..e51f9675a1a 100644 --- a/src/gallium/drivers/swr/rasterizer/core/frontend.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/frontend.cpp @@ -1332,7 +1332,7 @@ static void TessellationStages( TSDestroyCtx(tsCtx); } -THREAD PA_STATE::SIMDVERTEX *pVertexStore = nullptr; +THREAD PA_STATE::SIMDVERTEX *gpVertexStore = nullptr; THREAD uint32_t gVertexStoreSize = 0; ////////////////////////////////////////////////////////////////////////// @@ -1459,19 +1459,22 @@ void ProcessDraw( // grow the vertex store for the PA as necessary if (gVertexStoreSize < vertexStoreSize) { - if (pVertexStore != nullptr) + if (gpVertexStore != nullptr) { - AlignedFree(pVertexStore); + AlignedFree(gpVertexStore); + gpVertexStore = nullptr; } - pVertexStore = reinterpret_cast(AlignedMalloc(vertexStoreSize, 64)); + SWR_ASSERT(gpVertexStore == nullptr); + + gpVertexStore = reinterpret_cast(AlignedMalloc(vertexStoreSize, 64)); gVertexStoreSize = vertexStoreSize; - SWR_ASSERT(pVertexStore != nullptr); + SWR_ASSERT(gpVertexStore != nullptr); } // choose primitive assembler - PA_FACTORY paFactory(pDC, state.topology, work.numVerts, pVertexStore, numVerts, state.frontendState.vsVertexSize); + PA_FACTORY paFactory(pDC, state.topology, work.numVerts, gpVertexStore, numVerts, state.frontendState.vsVertexSize); PA_STATE& pa = paFactory.GetPA(); #if USE_SIMD16_FRONTEND -- 2.30.2