From c423f48204ee6caa8c82fb24df9f30f2a252153c Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Mon, 25 Mar 2024 23:02:30 +0100 Subject: [PATCH] frontend/nine: fix typos Signed-off-by: David Heidelberg Part-of: --- src/gallium/frontends/nine/buffer9.c | 6 +++--- src/gallium/frontends/nine/cubetexture9.c | 2 +- src/gallium/frontends/nine/device9.c | 4 ++-- src/gallium/frontends/nine/iunknown.h | 2 +- src/gallium/frontends/nine/nine_ff.c | 2 +- src/gallium/frontends/nine/nine_memory_helper.c | 2 +- src/gallium/frontends/nine/nine_pipe.h | 2 +- src/gallium/frontends/nine/nine_queue.c | 6 +++--- src/gallium/frontends/nine/nine_shader.c | 6 +++--- src/gallium/frontends/nine/nine_state.c | 2 +- src/gallium/frontends/nine/nine_state.h | 4 ++-- src/gallium/frontends/nine/query9.c | 2 +- src/gallium/frontends/nine/texture9.c | 4 ++-- src/gallium/frontends/nine/vertexdeclaration9.c | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/gallium/frontends/nine/buffer9.c b/src/gallium/frontends/nine/buffer9.c index b4ad29793ab..94d40e89d9e 100644 --- a/src/gallium/frontends/nine/buffer9.c +++ b/src/gallium/frontends/nine/buffer9.c @@ -250,7 +250,7 @@ NineBuffer9_Lock( struct NineBuffer9 *This, /* Write out of bound seems to have to be taken into account for these. * TODO: Do more tests (is it only at buffer first lock ? etc). * Since these buffers are supposed to be locked once and never - * writen again (MANAGED or DYNAMIC is used for the other uses cases), + * written again (MANAGED or DYNAMIC is used for the other uses cases), * performance should be unaffected. */ if (!(This->base.usage & D3DUSAGE_DYNAMIC) && This->base.pool == D3DPOOL_DEFAULT) SizeToLock = This->size - OffsetToLock; @@ -603,7 +603,7 @@ NineBuffer9_Upload( struct NineBuffer9 *This ) upload_flags |= PIPE_MAP_UNSYNCHRONIZED; } else { /* We cannot use PIPE_MAP_UNSYNCHRONIZED. We must choose between no flag and DISCARD. - * Criterias to discard: + * Criteria to discard: * . Most of the resource was filled (but some apps do allocate a big buffer * to only use a small part in a round fashion) * . The region to upload is very small compared to the filled region and @@ -621,7 +621,7 @@ NineBuffer9_Upload( struct NineBuffer9 *This ) /* Avoid DISCARDING too much by discarding only if most of the buffer * has been used */ DBG_FLAG(DBG_INDEXBUFFER|DBG_VERTEXBUFFER, - "Uploading %p DISCARD: valid %d %d, filled %d %d, required %d %d, box_upload %d %d, required already_valid %d %d, conficting %d %d\n", + "Uploading %p DISCARD: valid %d %d, filled %d %d, required %d %d, box_upload %d %d, required already_valid %d %d, conflicting %d %d\n", This, valid_region->x, valid_region->width, filled_region->x, filled_region->width, required_valid_region->x, required_valid_region->width, box_upload.x, box_upload.width, region_already_valid.x, region_already_valid.width, conflicting_region.x, conflicting_region.width diff --git a/src/gallium/frontends/nine/cubetexture9.c b/src/gallium/frontends/nine/cubetexture9.c index 7bae58fab86..9bf4eac6faf 100644 --- a/src/gallium/frontends/nine/cubetexture9.c +++ b/src/gallium/frontends/nine/cubetexture9.c @@ -123,7 +123,7 @@ NineCubeTexture9_ctor( struct NineCubeTexture9 *This, sfdesc.Pool = Pool; sfdesc.MultiSampleType = D3DMULTISAMPLE_NONE; sfdesc.MultiSampleQuality = 0; - /* We allocate the memory for the surfaces as continous blocks. + /* We allocate the memory for the surfaces as continuous blocks. * This is the expected behaviour, however we haven't tested for * cube textures in which order the faces/levels should be in memory */ diff --git a/src/gallium/frontends/nine/device9.c b/src/gallium/frontends/nine/device9.c index 0f4fc7c44d1..1ce6d3d24d9 100644 --- a/src/gallium/frontends/nine/device9.c +++ b/src/gallium/frontends/nine/device9.c @@ -220,7 +220,7 @@ NineDevice9_ctor( struct NineDevice9 *This, This->may_swvp = true; } This->context.swvp = This->swvp; - /* TODO: check if swvp is resetted by device Resets */ + /* TODO: check if swvp is reset by device Resets */ if (This->may_swvp && (This->screen->get_shader_param(This->screen, PIPE_SHADER_VERTEX, @@ -2638,7 +2638,7 @@ NineDevice9_GetClipStatus( struct NineDevice9 *This, /* Set/GetClipStatus is supposed to get the app some infos * about vertices being clipped if it is using the software * vertex rendering. It would be too complicated to implement. - * Probably the info is for developpers when working on their + * Probably the info is for developers when working on their * applications. Else it could be for apps to know if it is worth * drawing some elements. In that case it makes sense to send * 0 for ClipUnion and 0xFFFFFFFF for ClipIntersection (basically diff --git a/src/gallium/frontends/nine/iunknown.h b/src/gallium/frontends/nine/iunknown.h index 92c03bcadcf..01448a412d3 100644 --- a/src/gallium/frontends/nine/iunknown.h +++ b/src/gallium/frontends/nine/iunknown.h @@ -23,7 +23,7 @@ struct NineDevice9; struct NineUnknown { - /* pointer to vtable (can be overriden outside gallium nine) */ + /* pointer to vtable (can be overridden outside gallium nine) */ void *vtable; /* pointer to internal vtable */ void *vtable_internal; diff --git a/src/gallium/frontends/nine/nine_ff.c b/src/gallium/frontends/nine/nine_ff.c index 2406e82adf6..735406f468c 100644 --- a/src/gallium/frontends/nine/nine_ff.c +++ b/src/gallium/frontends/nine/nine_ff.c @@ -819,7 +819,7 @@ nine_ff_build_vs(struct NineDevice9 *device, struct vs_build_ctx *vs) const unsigned loop_label = l++; - /* Declare all light constants to allow indirect adressing */ + /* Declare all light constants to allow indirect addressing */ for (i = 32; i < 96; i++) ureg_DECL_constant(ureg, i); diff --git a/src/gallium/frontends/nine/nine_memory_helper.c b/src/gallium/frontends/nine/nine_memory_helper.c index 433ee973b92..67febdda98a 100644 --- a/src/gallium/frontends/nine/nine_memory_helper.c +++ b/src/gallium/frontends/nine/nine_memory_helper.c @@ -401,7 +401,7 @@ static struct nine_memfd_file_region *allocate_region(struct nine_allocator *all } /* Go through memfd allocated files, and try to use unused memory for the requested allocation. - * Returns whether it suceeded */ + * Returns whether it succeeded */ static bool insert_new_allocation(struct nine_allocator *allocator, struct nine_allocation *new_allocation, unsigned allocation_size) { diff --git a/src/gallium/frontends/nine/nine_pipe.h b/src/gallium/frontends/nine/nine_pipe.h index 324abbafd1b..01dd49d5c0c 100644 --- a/src/gallium/frontends/nine/nine_pipe.h +++ b/src/gallium/frontends/nine/nine_pipe.h @@ -375,7 +375,7 @@ d3d9_to_pipe_format_checked(struct pipe_screen *screen, /* The quality levels are vendor dependent, so we set our own. * Every quality level has its own sample count and sample * position matrix. - * The exact mapping might differ from system to system but thats OK, + * The exact mapping might differ from system to system but that's OK, * as there's no way to gather more information about quality levels * in D3D9. * In case of NONMASKABLE multisample map every quality-level diff --git a/src/gallium/frontends/nine/nine_queue.c b/src/gallium/frontends/nine/nine_queue.c index 159bf4f2c1b..cd73516e68e 100644 --- a/src/gallium/frontends/nine/nine_queue.c +++ b/src/gallium/frontends/nine/nine_queue.c @@ -28,7 +28,7 @@ * * nine_queue_flush does block, while nine_queue_alloc doesn't block. * - * nine_queue_alloc returns NULL on insufficent space. + * nine_queue_alloc returns NULL on insufficient space. * * Consumer: * Calls nine_queue_wait_flush to wait for a cmdbuf. @@ -189,7 +189,7 @@ nine_queue_alloc(struct nine_queue_pool* ctx, unsigned space) /* Returns the current queue flush state. * TRUE nothing flushed - * FALSE one ore more instructions queued flushed. */ + * FALSE one or more instructions queued flushed. */ bool nine_queue_no_flushed_work(struct nine_queue_pool* ctx) { @@ -198,7 +198,7 @@ nine_queue_no_flushed_work(struct nine_queue_pool* ctx) /* Returns the current queue empty state. * TRUE no instructions queued. - * FALSE one ore more instructions queued. */ + * FALSE one or more instructions queued. */ bool nine_queue_isempty(struct nine_queue_pool* ctx) { diff --git a/src/gallium/frontends/nine/nine_shader.c b/src/gallium/frontends/nine/nine_shader.c index 6134922c8c5..af1a0ccafa1 100644 --- a/src/gallium/frontends/nine/nine_shader.c +++ b/src/gallium/frontends/nine/nine_shader.c @@ -1131,7 +1131,7 @@ tx_src_param(struct shader_translator *tx, const struct sm1_src_param *param) src = ureg_imm1f(ureg, 0.0f); break; case D3DSPR_CONSTINT: - /* relative adressing only possible for float constants in vs */ + /* relative addressing only possible for float constants in vs */ if (!tx_lconsti(tx, &src, param->idx)) src = nine_integer_constant_src(tx, param->idx); break; @@ -1753,10 +1753,10 @@ DECL_SPECIAL(CND) /* the coissue flag was a tip for compilers to advise to * execute two operations at the same time, in cases - * the two executions had same dst with different channels. + * the two executions had the same dst with different channels. * It has no effect on current hw. However it seems CND * is affected. The handling of this very specific case - * handled below mimick wine behaviour */ + * handled below mimic wine behaviour */ if (tx->insn.coissue && tx->version.major == 1 && tx->version.minor < 4 && tx->insn.dst[0].mask != NINED3DSP_WRITEMASK_3) { ureg_MOV(tx->ureg, dst, tx_src_param(tx, &tx->insn.src[1])); diff --git a/src/gallium/frontends/nine/nine_state.c b/src/gallium/frontends/nine/nine_state.c index f2793a3152a..4acb9ee3010 100644 --- a/src/gallium/frontends/nine/nine_state.c +++ b/src/gallium/frontends/nine/nine_state.c @@ -744,7 +744,7 @@ update_framebuffer(struct NineDevice9 *device, bool is_clear) /* Special case: D3DFMT_NULL is used to bound no real render target, * but render to depth buffer. We have to not take into account the render - * target info. TODO: know what should happen when there are several render targers + * target info. TODO: know what should happen when there are several render targets * and the first one is D3DFMT_NULL */ if (rt0->desc.Format == D3DFMT_NULL && context->ds) { w = context->ds->desc.Width; diff --git a/src/gallium/frontends/nine/nine_state.h b/src/gallium/frontends/nine/nine_state.h index ee41b7260f0..e4f6df369ce 100644 --- a/src/gallium/frontends/nine/nine_state.h +++ b/src/gallium/frontends/nine/nine_state.h @@ -76,7 +76,7 @@ #define NINE_STATE_UNHANDLED (1 << 29) /* These states affect the ff shader key, - * which we recompute everytime. */ + * which we recompute every time. */ #define NINE_STATE_FF_SHADER 0 #define NINE_STATE_COMMIT_DSA (1 << 0) @@ -681,7 +681,7 @@ nine_context_get_pipe_multithread( struct NineDevice9 *device ); /* Get the pipe_context (should not be called from the worker thread). * All the work in the worker thread is paused before returning. - * It is neccessary to release in order to restart the thread. + * It is necessary to release in order to restart the thread. * This is intended for use of the nine_context pipe_context that don't * need the worker thread to finish all queued job. */ struct pipe_context * diff --git a/src/gallium/frontends/nine/query9.c b/src/gallium/frontends/nine/query9.c index 27900796aa8..dd814a1d0aa 100644 --- a/src/gallium/frontends/nine/query9.c +++ b/src/gallium/frontends/nine/query9.c @@ -212,7 +212,7 @@ NineQuery9_GetData( struct NineQuery9 *This, wait_query_result = true; } - /* The documention mentions no special case for D3DQUERYTYPE_TIMESTAMP. + /* The documentation mentions no special case for D3DQUERYTYPE_TIMESTAMP. * However Windows tests show that the query always succeeds when * D3DGETDATA_FLUSH is specified. */ if (This->type == D3DQUERYTYPE_TIMESTAMP && diff --git a/src/gallium/frontends/nine/texture9.c b/src/gallium/frontends/nine/texture9.c index dfe92196217..ee608fff144 100644 --- a/src/gallium/frontends/nine/texture9.c +++ b/src/gallium/frontends/nine/texture9.c @@ -176,7 +176,7 @@ NineTexture9_ctor( struct NineTexture9 *This, sfdesc.Width = u_minify(Width, l); sfdesc.Height = u_minify(Height, l); /* Some apps expect the memory to be allocated in - * continous blocks */ + * continuous blocks */ user_buffer_for_level = user_buffer ? nine_suballocate(pParams->device->allocator, user_buffer, level_offsets[l]) : NULL; @@ -191,7 +191,7 @@ NineTexture9_ctor( struct NineTexture9 *This, /* Textures start initially dirty */ This->dirty_rect.width = Width; This->dirty_rect.height = Height; - This->dirty_rect.depth = 1; /* widht == 0 means empty, depth stays 1 */ + This->dirty_rect.depth = 1; /* width == 0 means empty, depth stays 1 */ if (pSharedHandle && !*pSharedHandle) {/* Pool == D3DPOOL_SYSTEMMEM */ *pSharedHandle = This->surfaces[0]->data; diff --git a/src/gallium/frontends/nine/vertexdeclaration9.c b/src/gallium/frontends/nine/vertexdeclaration9.c index 41f68a1af64..9096f9fa655 100644 --- a/src/gallium/frontends/nine/vertexdeclaration9.c +++ b/src/gallium/frontends/nine/vertexdeclaration9.c @@ -194,7 +194,7 @@ NineVertexDeclaration9_ctor( struct NineVertexDeclaration9 *This, This->elems[i].vertex_buffer_index = This->decls[i].Stream; This->elems[i].src_format = decltype_format(This->decls[i].Type); This->elems[i].dual_slot = false; - /* XXX Remember Method (tesselation), Usage, UsageIndex */ + /* XXX Remember Method (tessellation), Usage, UsageIndex */ DBG("VERTEXELEMENT[%u]: Stream=%u Offset=%u Type=%s DeclUsage=%s%d\n", i, This->decls[i].Stream,