Module: Mesa Branch: master Commit: c10d46bac7c5970c3c3a52cc2d28984fd06ce8c2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c10d46bac7c5970c3c3a52cc2d28984fd06ce8c2
Author: Vinson Lee <[email protected]> Date: Wed Dec 23 20:14:42 2020 -0800 swr: Fix typos. Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8223> --- src/gallium/drivers/swr/rasterizer/archrast/events.proto | 4 ++-- src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py | 4 ++-- src/gallium/drivers/swr/rasterizer/codegen/gen_common.py | 2 +- .../rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp | 4 ++-- src/gallium/drivers/swr/rasterizer/core/api.cpp | 2 +- src/gallium/drivers/swr/rasterizer/core/api.h | 4 ++-- src/gallium/drivers/swr/rasterizer/core/binner.h | 10 +++++----- src/gallium/drivers/swr/rasterizer/core/context.h | 6 +++--- src/gallium/drivers/swr/rasterizer/core/pa.h | 2 +- src/gallium/drivers/swr/rasterizer/core/threads.cpp | 4 ++-- src/gallium/drivers/swr/rasterizer/core/tilemgr.h | 2 +- src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp | 2 +- src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp | 2 +- src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp | 10 +++++----- src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h | 4 ++-- .../drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp | 4 ++-- src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.h | 2 +- src/gallium/drivers/swr/swr_shader.cpp | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/gallium/drivers/swr/rasterizer/archrast/events.proto b/src/gallium/drivers/swr/rasterizer/archrast/events.proto index a53089386f6..24739293a30 100644 --- a/src/gallium/drivers/swr/rasterizer/archrast/events.proto +++ b/src/gallium/drivers/swr/rasterizer/archrast/events.proto @@ -37,14 +37,14 @@ event Framework::ThreadStartWorkerEvent { }; -///@brief Used as a helper event to indicate end of frame. Does not gaurantee to capture end of frame on all APIs +///@brief Used as a helper event to indicate end of frame. Does not guarantee to capture end of frame on all APIs event ApiSwr::FrameEndEvent { uint32_t frameId; // current frame id uint32_t nextDrawId; // next draw id (always incremental - does not reset) }; -///@brief Synchonization event. +///@brief Synchronization event. event ApiSwr::SwrSyncEvent { uint32_t drawId; diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py index 2931ce816ba..fa3e348e6ae 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py @@ -31,7 +31,7 @@ from gen_common import * def main(args=sys.argv[1:]): thisDir = os.path.dirname(os.path.realpath(__file__)) - parser = ArgumentParser('Generate files and initialization functions for all permutuations of BackendPixelRate.') + parser = ArgumentParser('Generate files and initialization functions for all permutations of BackendPixelRate.') parser.add_argument('--dim', help='gBackendPixelRateTable array dimensions', nargs='+', type=int, required=True) parser.add_argument('--outdir', help='output directory', nargs='?', type=str, default=thisDir) parser.add_argument('--split', help='how many lines of initialization per file [0=no split]', nargs='?', type=int, default='512') @@ -85,7 +85,7 @@ def main(args=sys.argv[1:]): #print each list member as an index in the multidimensional array for i in new_list: tempStr += '[' + str(i) + ']' - #map each entry in the permuation as its own string member, store as the template instantiation string + #map each entry in the permutation as its own string member, store as the template instantiation string tempStr += backend.funcInstanceHeader + ','.join(map(str, output_combinations[x])) + '>>;' #append the line of c++ code in the list of output lines output_list.append(tempStr) diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_common.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_common.py index 60b749d3abc..cea3ac8fcbb 100644 --- a/src/gallium/drivers/swr/rasterizer/codegen/gen_common.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_common.py @@ -220,7 +220,7 @@ class ArgumentParser(argparse.ArgumentParser): ''' Better help formatter for argument parser ''' def _split_lines(self, text, width): - ''' optimized split lines algorighm, indents split lines ''' + ''' optimized split lines algorithm, indents split lines ''' lines = text.splitlines() out_lines = [] if len(lines): 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 6e9fdb52a74..ba5a51700f3 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 @@ -67,7 +67,7 @@ namespace ArchRast } // There could be multiple threads creating thread pools. We - // want to make sure they are uniquly identified by adding in + // want to make sure they are uniquely identified by adding in // the creator's thread id into the filename. std::stringstream fstr; fstr << outDir.str().c_str() << "\\ar_event" << std::this_thread::get_id(); @@ -75,7 +75,7 @@ namespace ArchRast mFilename = fstr.str(); #else // There could be multiple threads creating thread pools. We - // want to make sure they are uniquly identified by adding in + // want to make sure they are uniquely identified by adding in // the creator's thread id into the filename. std::stringstream fstr; fstr << "/tmp/ar_event" << std::this_thread::get_id(); diff --git a/src/gallium/drivers/swr/rasterizer/core/api.cpp b/src/gallium/drivers/swr/rasterizer/core/api.cpp index 107277bc88f..bee257d7723 100644 --- a/src/gallium/drivers/swr/rasterizer/core/api.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/api.cpp @@ -1063,7 +1063,7 @@ void SetupPipeline(DRAW_CONTEXT* pDC) pState->state.pfnQuantizeDepth = QuantizeDepth<R16_UNORM>; break; default: - SWR_INVALID("Unsupported depth format for depth quantiztion."); + SWR_INVALID("Unsupported depth format for depth quantization."); pState->state.pfnQuantizeDepth = QuantizeDepth<R32_FLOAT>; } } diff --git a/src/gallium/drivers/swr/rasterizer/core/api.h b/src/gallium/drivers/swr/rasterizer/core/api.h index 77f20e5834b..cc6b5105e45 100644 --- a/src/gallium/drivers/swr/rasterizer/core/api.h +++ b/src/gallium/drivers/swr/rasterizer/core/api.h @@ -291,7 +291,7 @@ struct SWR_CREATECONTEXT_INFO // ArchRast event manager. HANDLE hArEventManager; - // handle to external memory for worker datas to create memory contexts + // handle to external memory for worker data to create memory contexts HANDLE hExternalMemory; // Input (optional): Threading info that overrides any set KNOB values. @@ -610,7 +610,7 @@ SWR_FUNC(void, /// @note this enum needs to be kept in sync with HOTTILE_STATE! enum SWR_TILE_STATE { - SWR_TILE_INVALID = 0, // tile is in unitialized state and should be loaded with surface contents + SWR_TILE_INVALID = 0, // tile is in uninitialized state and should be loaded with surface contents // before rendering SWR_TILE_DIRTY = 2, // tile contains newer data than surface it represents SWR_TILE_RESOLVED = 3, // is in sync with surface it represents diff --git a/src/gallium/drivers/swr/rasterizer/core/binner.h b/src/gallium/drivers/swr/rasterizer/core/binner.h index f5f6d8074cb..63be8f67cbf 100644 --- a/src/gallium/drivers/swr/rasterizer/core/binner.h +++ b/src/gallium/drivers/swr/rasterizer/core/binner.h @@ -129,11 +129,11 @@ INLINE void calcBoundingBoxIntVertical(const Integer<SIMD_T> (&vX)[3], ////////////////////////////////////////////////////////////////////////// /// @brief Gather scissor rect data based on per-prim viewport indices. /// @param pScissorsInFixedPoint - array of scissor rects in 16.8 fixed point. -/// @param pViewportIndex - array of per-primitive vewport indexes. -/// @param scisXmin - output vector of per-prmitive scissor rect Xmin data. -/// @param scisYmin - output vector of per-prmitive scissor rect Ymin data. -/// @param scisXmax - output vector of per-prmitive scissor rect Xmax data. -/// @param scisYmax - output vector of per-prmitive scissor rect Ymax data. +/// @param pViewportIndex - array of per-primitive viewport indexes. +/// @param scisXmin - output vector of per-primitive scissor rect Xmin data. +/// @param scisYmin - output vector of per-primitive scissor rect Ymin data. +/// @param scisXmax - output vector of per-primitive scissor rect Xmax data. +/// @param scisYmax - output vector of per-primitive scissor rect Ymax data. // /// @todo: Look at speeding this up -- weigh against corresponding costs in rasterizer. static void GatherScissors(const SWR_RECT* pScissorsInFixedPoint, diff --git a/src/gallium/drivers/swr/rasterizer/core/context.h b/src/gallium/drivers/swr/rasterizer/core/context.h index 8f74f135b63..b874520b9d8 100644 --- a/src/gallium/drivers/swr/rasterizer/core/context.h +++ b/src/gallium/drivers/swr/rasterizer/core/context.h @@ -423,7 +423,7 @@ struct DRAW_DYNAMIC_STATE SWR_STATS_FE statsFE; // Only one FE thread per DC. SWR_STATS* pStats; - uint64_t soPrims; // number of primitives written to StremOut buffer + uint64_t soPrims; // number of primitives written to StreamOut buffer }; // Draw Context @@ -480,7 +480,7 @@ class HotTileMgr; struct SWR_CONTEXT { // Draw Context Ring - // Each draw needs its own state in order to support mulitple draws in flight across multiple + // Each draw needs its own state in order to support multiple draws in flight across multiple // threads. We maintain N draw contexts configured as a ring. The size of the ring limits the // maximum number of draws that can be in flight at any given time. // @@ -563,7 +563,7 @@ struct SWR_CONTEXT // ArchRast thread contexts. HANDLE* pArContext; - // handle to external memory for worker datas to create memory contexts + // handle to external memory for worker data to create memory contexts HANDLE hExternalMemory; BucketManager *pBucketMgr; diff --git a/src/gallium/drivers/swr/rasterizer/core/pa.h b/src/gallium/drivers/swr/rasterizer/core/pa.h index c41376ae97b..adfc1414bae 100644 --- a/src/gallium/drivers/swr/rasterizer/core/pa.h +++ b/src/gallium/drivers/swr/rasterizer/core/pa.h @@ -1035,7 +1035,7 @@ struct PA_STATE_CUT : public PA_STATE } break; case 6: - SWR_ASSERT(this->adjExtraVert != -1, "Algorith failure!"); + SWR_ASSERT(this->adjExtraVert != -1, "Algorithm failure!"); AssembleTriStripAdj<gsEnabled>(); uint32_t nextTri[6]; diff --git a/src/gallium/drivers/swr/rasterizer/core/threads.cpp b/src/gallium/drivers/swr/rasterizer/core/threads.cpp index 1338f929071..8d4104f0af1 100644 --- a/src/gallium/drivers/swr/rasterizer/core/threads.cpp +++ b/src/gallium/drivers/swr/rasterizer/core/threads.cpp @@ -526,7 +526,7 @@ INLINE bool FindFirstIncompleteDraw(SWR_CONTEXT* pContext, /// locked, then it will add that tile to the lockedTiles set. As a worker /// begins to work on future draws the lockedTiles ensure that it doesn't work /// on tiles that may still have work pending in a previous draw. Additionally, -/// the lockedTiles is hueristic that can steer a worker back to the same +/// the lockedTiles is heuristic that can steer a worker back to the same /// macrotile that it had been working on in a previous draw. /// @returns true if worker thread should shutdown bool WorkOnFifoBE(SWR_CONTEXT* pContext, @@ -1401,7 +1401,7 @@ void DestroyThreadPool(SWR_CONTEXT* pContext, THREAD_POOL* pPool) if (!pContext->threadInfo.SINGLE_THREADED) { // Detach from thread. Cannot join() due to possibility (in Windows) of code - // in some DLLMain(THREAD_DETATCH case) blocking the thread until after this returns. + // in some DLLMain(THREAD_DETACH case) blocking the thread until after this returns. pPool->pThreads[t]->detach(); delete (pPool->pThreads[t]); } diff --git a/src/gallium/drivers/swr/rasterizer/core/tilemgr.h b/src/gallium/drivers/swr/rasterizer/core/tilemgr.h index 8e3b41ea1e7..fb8a4a14881 100644 --- a/src/gallium/drivers/swr/rasterizer/core/tilemgr.h +++ b/src/gallium/drivers/swr/rasterizer/core/tilemgr.h @@ -236,7 +236,7 @@ public: /// @note this enum needs to be kept in sync with SWR_TILE_STATE! enum HOTTILE_STATE { - HOTTILE_INVALID, // tile is in unitialized state and should be loaded with surface contents + HOTTILE_INVALID, // tile is in uninitialized state and should be loaded with surface contents // before rendering HOTTILE_CLEAR, // tile should be cleared HOTTILE_DIRTY, // tile has been rendered to diff --git a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp index 3568bba82f7..a224a52755c 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp @@ -185,7 +185,7 @@ struct BlendJit : public Builder break; case SWR_TYPE_UNKNOWN: - SWR_INVALID("Unsupport format type: %d", type); + SWR_INVALID("Unsupported format type: %d", type); } } diff --git a/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp b/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp index f30db9a3834..8080a40a1f9 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/builder_misc.cpp @@ -493,7 +493,7 @@ namespace SwrJit } } - // advance to the next arguement + // advance to the next argument v++; pos = tempStr.find('%', ++pos); } diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp index 7739ed5876d..bd5f7588c91 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp @@ -701,8 +701,8 @@ void FetchJit::JitGatherVertices(const FETCH_COMPILE_STATE& fetchState, vOffsets = ADD(vOffsets, vAlignmentOffsets); // if instance stride enable is: - // true - add product of the instanceID and advancement state to the offst into the VB - // false - value of vInstanceStride has been initialialized to zero + // true - add product of the instanceID and advancement state to the offset into the VB + // false - value of vInstanceStride has been initialized to zero vOffsets = ADD(vOffsets, vInstanceStride); // Packing and component control @@ -1334,7 +1334,7 @@ void FetchJit::Shuffle8bpcGatherd16(Shuffle8bpcArgs& args) char(z), char(z + 4), char(z + 8), char(z + 12), char(w), char(w + 4), char(w + 8), char(w + 12)}); - // SIMD16 PSHUFB isnt part of AVX-512F, so split into SIMD8 for the sake of KNL, for now.. + // SIMD16 PSHUFB isn't part of AVX-512F, so split into SIMD8 for the sake of KNL, for now.. Value* vGatherResult_lo = EXTRACT_16(vGatherResult, 0); Value* vGatherResult_hi = EXTRACT_16(vGatherResult, 1); @@ -1709,7 +1709,7 @@ void FetchJit::Shuffle16bpcGather16(Shuffle16bpcArgs& args) Value* vi128XY_hi = nullptr; if (isComponentEnabled(compMask, 0) || isComponentEnabled(compMask, 1)) { - // SIMD16 PSHUFB isnt part of AVX-512F, so split into SIMD8 for the sake of KNL, for + // SIMD16 PSHUFB isn't part of AVX-512F, so split into SIMD8 for the sake of KNL, for // now.. Value* vGatherResult_lo = BITCAST(EXTRACT_16(vGatherResult[0], 0), v32x8Ty); @@ -1895,7 +1895,7 @@ void FetchJit::Shuffle16bpcGather16(Shuffle16bpcArgs& args) // if x or y, use vi128XY permute result, else use vi128ZW uint32_t selectedGather = (i < 2) ? 0 : 1; - // SIMD16 PSHUFB isnt part of AVX-512F, so split into SIMD8 for the sake of KNL, + // SIMD16 PSHUFB isn't part of AVX-512F, so split into SIMD8 for the sake of KNL, // for now.. Value* vGatherResult_lo = EXTRACT_16(vGatherResult[selectedGather], 0); diff --git a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h index abc3091354f..9c4c6672184 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h +++ b/src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.h @@ -111,8 +111,8 @@ struct FETCH_COMPILE_STATE bool bForceSequentialAccessEnable{false}; bool bInstanceIDOffsetEnable{false}; - FETCH_COMPILE_STATE(bool diableIndexOOBCheck = false) : - bDisableIndexOOBCheck(diableIndexOOBCheck){}; + FETCH_COMPILE_STATE(bool disableIndexOOBCheck = false) : + bDisableIndexOOBCheck(disableIndexOOBCheck){}; bool operator==(const FETCH_COMPILE_STATE& other) const { diff --git a/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp b/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp index e5fb08b5e56..61c6b57b38b 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp +++ b/src/gallium/drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp @@ -40,7 +40,7 @@ extern "C" void ScatterPS_256(uint8_t*, SIMD256::Integer, SIMD256::Float, uint8_ namespace llvm { - // foward declare the initializer + // forward declare the initializer void initializeLowerX86Pass(PassRegistry&); } // namespace llvm @@ -421,7 +421,7 @@ namespace SwrJit } ////////////////////////////////////////////////////////////////////////// - /// @brief LLVM funtion pass run method. + /// @brief LLVM function pass run method. /// @param f- The function we're working on with this pass. virtual bool runOnFunction(Function& F) { diff --git a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.h b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.h index cee7b5748ed..d76fcdd5742 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.h +++ b/src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.h @@ -55,7 +55,7 @@ struct STREAMOUT_DECL ////////////////////////////////////////////////////////////////////////// struct STREAMOUT_STREAM { - // numnber of decls for this stream + // number of decls for this stream uint32_t numDecls; // array of numDecls decls diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp index 4de1ca6b95e..315036920fb 100644 --- a/src/gallium/drivers/swr/swr_shader.cpp +++ b/src/gallium/drivers/swr/swr_shader.cpp @@ -1522,7 +1522,7 @@ BuilderSWR::CompileGS(struct swr_context *ctx, swr_jit_gs_key &key) pGS->vertexAttribOffset = VERTEX_POSITION_SLOT; pGS->inputVertStride = pGS->numInputAttribs + pGS->vertexAttribOffset; pGS->outputVertexSize = SWR_VTX_NUM_SLOTS; - pGS->controlDataSize = 8; // GS ouputs max of 8 32B units + pGS->controlDataSize = 8; // GS outputs max of 8 32B units pGS->controlDataOffset = VERTEX_COUNT_SIZE; pGS->outputVertexOffset = pGS->controlDataOffset + CONTROL_HEADER_SIZE; @@ -1922,7 +1922,7 @@ BuilderSWR::CompileTES(struct swr_context *ctx, swr_jit_tes_key &key) case TGSI_SEMANTIC_PSIZE: break; default: - assert(!"Unexpected semantic found while builiding TES input map"); + assert(!"Unexpected semantic found while building TES input map"); } if (semantic_name == TGSI_SEMANTIC_PATCH) { STORE(C(tcs_slot), patchAttribMap, {0, slot}); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
