From 6afdc8732c4fca735803b6cbacf9723bbd02afa4 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Tue, 1 Aug 2017 15:21:04 -0500 Subject: [PATCH] swr/rast: Removed some trailing whitespace caught during review Reviewed-by: Bruce Cherniak --- .../codegen/templates/gen_ar_eventhandlerfile.hpp | 4 ++-- src/gallium/drivers/swr/rasterizer/core/fifo.hpp | 4 ++-- src/gallium/drivers/swr/rasterizer/core/pa.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp index 0ca9a7828db..d1852b35fde 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp @@ -23,7 +23,7 @@ * @file ${filename} * * @brief Event handler interface. auto-generated file -* +* * DO NOT EDIT * * Generation Command Line: @@ -57,7 +57,7 @@ namespace ArchRast std::stringstream outDir; outDir << KNOB_DEBUG_OUTPUT_DIR << pBaseName << "_" << pid << std::ends; CreateDirectory(outDir.str().c_str(), NULL); - + // There could be multiple threads creating thread pools. We // want to make sure they are uniquly identified by adding in // the creator's thread id into the filename. diff --git a/src/gallium/drivers/swr/rasterizer/core/fifo.hpp b/src/gallium/drivers/swr/rasterizer/core/fifo.hpp index 3be72f37cd6..43d3a832267 100644 --- a/src/gallium/drivers/swr/rasterizer/core/fifo.hpp +++ b/src/gallium/drivers/swr/rasterizer/core/fifo.hpp @@ -79,7 +79,7 @@ struct QUEUE long initial = InterlockedCompareExchange(&mLock, 1, 0); return (initial == 0); } - + void unlock() { mLock = 0; @@ -112,7 +112,7 @@ struct QUEUE __m256 vSrc = _mm256_load_ps(pSrc + i*KNOB_SIMD_WIDTH); _mm256_stream_ps(pDst + i*KNOB_SIMD_WIDTH, vSrc); }; - + const uint32_t numSimdLines = sizeof(T) / (KNOB_SIMD_WIDTH*4); static_assert(numSimdLines * KNOB_SIMD_WIDTH * 4 == sizeof(T), "FIFO element size should be multiple of SIMD width."); diff --git a/src/gallium/drivers/swr/rasterizer/core/pa.h b/src/gallium/drivers/swr/rasterizer/core/pa.h index cb3470ff6b8..87dba22bf80 100644 --- a/src/gallium/drivers/swr/rasterizer/core/pa.h +++ b/src/gallium/drivers/swr/rasterizer/core/pa.h @@ -162,7 +162,7 @@ struct PA_STATE_OPT : public PA_STATE bool isStreaming{ false }; SIMDMASK junkIndices { 0 }; // temporary index store for unused virtual function - + PA_STATE_OPT() {} PA_STATE_OPT(DRAW_CONTEXT* pDC, uint32_t numPrims, uint8_t* pStream, uint32_t streamSizeInVerts, uint32_t vertexStride, bool in_isStreaming, PRIMITIVE_TOPOLOGY topo = TOP_UNKNOWN); @@ -412,7 +412,7 @@ struct PA_STATE_CUT : public PA_STATE uint32_t vertsPerPrim{ 0 }; bool processCutVerts{ false }; // vertex indices with cuts should be processed as normal, otherwise they // are ignored. Fetch shader sends invalid verts on cuts that should be ignored - // while the GS sends valid verts for every index + // while the GS sends valid verts for every index simdvector junkVector; // junk simdvector for unimplemented API #if ENABLE_AVX512_SIMD16 @@ -575,7 +575,7 @@ struct PA_STATE_CUT : public PA_STATE return CheckBit(this->pCutIndices[vertexIndex], vertexOffset); } - // iterates across the unprocessed verts until we hit the end or we + // iterates across the unprocessed verts until we hit the end or we // have assembled SIMD prims void ProcessVerts() { @@ -583,7 +583,7 @@ struct PA_STATE_CUT : public PA_STATE this->numRemainingVerts > 0 && this->curVertex != this->headVertex) { - // if cut index, restart topology + // if cut index, restart topology if (IsCutIndex(this->curVertex)) { if (this->processCutVerts) @@ -923,7 +923,7 @@ struct PA_STATE_CUT : public PA_STATE case 6: SWR_ASSERT(this->adjExtraVert != -1, "Algorith failure!"); AssembleTriStripAdj(); - + uint32_t nextTri[6]; if (this->reverseWinding) { @@ -939,7 +939,7 @@ struct PA_STATE_CUT : public PA_STATE nextTri[1] = this->adjExtraVert; nextTri[2] = this->vert[3]; nextTri[4] = this->vert[4]; - nextTri[5] = this->vert[0]; + nextTri[5] = this->vert[0]; } for (uint32_t i = 0; i < 6; ++i) { -- 2.30.2