diff options
Diffstat (limited to 'src/gallium')
24 files changed, 26 insertions, 26 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c index 9e0cacecac1..0d1b4b3426a 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c @@ -323,7 +323,7 @@ fenced_buffer_remove_locked(struct fenced_manager *fenced_mgr, /** * Wait for the fence to expire, and remove it from the fenced list. * - * This function will release and re-aquire the mutex, so any copy of mutable + * This function will release and re-acquire the mutex, so any copy of mutable * state must be discarded after calling it. */ static INLINE enum pipe_error diff --git a/src/gallium/auxiliary/rbug/rbug_connection.c b/src/gallium/auxiliary/rbug/rbug_connection.c index 1c578d07842..152226f84e2 100644 --- a/src/gallium/auxiliary/rbug/rbug_connection.c +++ b/src/gallium/auxiliary/rbug/rbug_connection.c @@ -152,7 +152,7 @@ rbug_connection_write(struct rbug_connection *c, void *to, uint32_t size) /** * Internal function used by rbug_send_* functions. * - * Finish writeing data to the socket. + * Finish writing data to the socket. * Ups the send_serial and sets the serial argument if supplied. */ int rbug_connection_send_finish(struct rbug_connection *c, uint32_t *serial) diff --git a/src/gallium/drivers/i915/i915_prim_vbuf.c b/src/gallium/drivers/i915/i915_prim_vbuf.c index dff51c580c0..d134dbb1620 100644 --- a/src/gallium/drivers/i915/i915_prim_vbuf.c +++ b/src/gallium/drivers/i915/i915_prim_vbuf.c @@ -266,7 +266,7 @@ i915_vbuf_render_map_vertices(struct vbuf_render *render) struct i915_context *i915 = i915_render->i915; if (i915->vbo_flushed) - debug_printf("%s bad vbo flush occured stalling on hw\n", __FUNCTION__); + debug_printf("%s bad vbo flush occurred stalling on hw\n", __FUNCTION__); #ifdef VBUF_MAP_BUFFER return (unsigned char *)i915_render->vbo_ptr + i915_render->vbo_sw_offset; diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c index dc8f4d1c903..8ef73d6f2c2 100644 --- a/src/gallium/drivers/i915/i915_resource_texture.c +++ b/src/gallium/drivers/i915/i915_resource_texture.c @@ -452,7 +452,7 @@ i945_texture_layout_2d(struct i915_texture *tex) tex->stride = align(util_format_get_stride(pt->format, width), 4); - /* May need to adjust pitch to accomodate the placement of + /* May need to adjust pitch to accommodate the placement of * the 2nd mipmap level. This occurs when the alignment * constraints of mipmap placement push the right edge of the * 2nd mipmap level out past the width of its parent. diff --git a/src/gallium/drivers/i915/i915_state_dynamic.c b/src/gallium/drivers/i915/i915_state_dynamic.c index cf0f18afe78..4050cd4ac44 100644 --- a/src/gallium/drivers/i915/i915_state_dynamic.c +++ b/src/gallium/drivers/i915/i915_state_dynamic.c @@ -315,5 +315,5 @@ static void update_dynamic(struct i915_context *i915) struct i915_tracked_state i915_hw_dynamic = { "dynamic", update_dynamic, - ~0 /* all state atoms, becuase we do internal checking */ + ~0 /* all state atoms, because we do internal checking */ }; diff --git a/src/gallium/drivers/i915/i915_state_immediate.c b/src/gallium/drivers/i915/i915_state_immediate.c index 56af11324f6..d244a349fce 100644 --- a/src/gallium/drivers/i915/i915_state_immediate.c +++ b/src/gallium/drivers/i915/i915_state_immediate.c @@ -230,5 +230,5 @@ static void update_immediate(struct i915_context *i915) struct i915_tracked_state i915_hw_immediate = { "immediate", update_immediate, - ~0 /* all state atoms, becuase we do internal checking */ + ~0 /* all state atoms, because we do internal checking */ }; diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c index 7019acbda9d..c726707c062 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.c +++ b/src/gallium/drivers/llvmpipe/lp_rast.c @@ -82,7 +82,7 @@ lp_rast_end( struct lp_rasterizer *rast ) /** - * Begining rasterization of a tile. + * Beginning rasterization of a tile. * \param x window X position of the tile, in pixels * \param y window Y position of the tile, in pixels */ diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h index ad23c2009ac..a226ff0c485 100644 --- a/src/gallium/drivers/llvmpipe/lp_scene.h +++ b/src/gallium/drivers/llvmpipe/lp_scene.h @@ -63,7 +63,7 @@ struct lp_rast_state; #define LP_SCENE_MAX_SIZE (9*1024*1024) /* The maximum amount of texture storage referenced by a scene is - * clamped ot this size: + * clamped to this size: */ #define LP_SCENE_MAX_RESOURCE_SIZE (64*1024*1024) diff --git a/src/gallium/drivers/r300/compiler/memory_pool.h b/src/gallium/drivers/r300/compiler/memory_pool.h index 42344d0e3ba..efb000a0aba 100644 --- a/src/gallium/drivers/r300/compiler/memory_pool.h +++ b/src/gallium/drivers/r300/compiler/memory_pool.h @@ -49,7 +49,7 @@ void * memory_pool_malloc(struct memory_pool * pool, unsigned int bytes); /** * Generic helper for growing an array that has separate size/count - * and reserved counters to accomodate up to num new element. + * and reserved counters to accommodate up to num new element. * * type * Array; * unsigned int Size; diff --git a/src/gallium/drivers/r300/compiler/radeon_variable.c b/src/gallium/drivers/r300/compiler/radeon_variable.c index ba895239fb6..7730b937372 100644 --- a/src/gallium/drivers/r300/compiler/radeon_variable.c +++ b/src/gallium/drivers/r300/compiler/radeon_variable.c @@ -98,7 +98,7 @@ void rc_variable_change_dst( /* Reuse the source index of the source that * was just deleted and set its register * index. We can't use rc_pair_alloc_source - * for this becuase it might return a source + * for this because it might return a source * index that is already being used. */ if (src_type & RC_SOURCE_RGB) { pair_inst->RGB.Src[src_index] diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c index b632963d187..4c9971e5128 100644 --- a/src/gallium/drivers/r300/r300_emit.c +++ b/src/gallium/drivers/r300/r300_emit.c @@ -694,7 +694,7 @@ static void r300_emit_query_end_frag_pipes(struct r300_context *r300, OUT_CS_RELOC(r300->query_current); case 2: /* pipe 1 only */ - /* As mentioned above, accomodate RV380 and older. */ + /* As mentioned above, accommodate RV380 and older. */ OUT_CS_REG(R300_SU_REG_DEST, 1 << (caps->high_second_pipe ? 3 : 1)); OUT_CS_REG(R300_ZB_ZPASS_ADDR, (query->num_results + 1) * 4); diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h index 8a0728d9430..9c373c5d111 100644 --- a/src/gallium/drivers/r300/r300_reg.h +++ b/src/gallium/drivers/r300/r300_reg.h @@ -1179,7 +1179,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define R300_GA_SOFT_RESET 0x429c /* Not sure why there are duplicate of factor and constant values. - * My best guess so far is that there are seperate zbiases for test and write. + * My best guess so far is that there are separate zbiases for test and write. * Ordering might be wrong. * Some of the tests indicate that fgl has a fallback implementation of zbias * via pixel shaders. diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.h b/src/gallium/drivers/r300/r300_tgsi_to_rc.h index adb044cfe56..21f35e15ca2 100644 --- a/src/gallium/drivers/r300/r300_tgsi_to_rc.h +++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.h @@ -48,7 +48,7 @@ struct tgsi_to_rc { * until rc grows proper support, indicate if they're safe to use. */ boolean use_half_swizzles; - /* If an error occured. */ + /* If an error occurred. */ boolean error; }; diff --git a/src/gallium/drivers/r600/evergreen_hw_context.c b/src/gallium/drivers/r600/evergreen_hw_context.c index 63c2906d0cb..e2728565489 100644 --- a/src/gallium/drivers/r600/evergreen_hw_context.c +++ b/src/gallium/drivers/r600/evergreen_hw_context.c @@ -63,7 +63,7 @@ void evergreen_dma_copy_buffer(struct r600_context *rctx, r600_need_dma_space(&rctx->b, ncopy * 5); for (i = 0; i < ncopy; i++) { csize = size < EG_DMA_COPY_MAX_SIZE ? size : EG_DMA_COPY_MAX_SIZE; - /* emit reloc before writting cs so that cs is always in consistent state */ + /* emit reloc before writing cs so that cs is always in consistent state */ r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, rsrc, RADEON_USAGE_READ, RADEON_PRIO_MIN); r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, rdst, RADEON_USAGE_WRITE, diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index edd886b96f2..266e372f35f 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -3282,7 +3282,7 @@ static void evergreen_dma_copy_tile(struct r600_context *rctx, cheight = (EG_DMA_COPY_MAX_SIZE * 4) / pitch; } size = (cheight * pitch) / 4; - /* emit reloc before writting cs so that cs is always in consistent state */ + /* emit reloc before writing cs so that cs is always in consistent state */ r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, &rsrc->resource, RADEON_USAGE_READ, RADEON_PRIO_MIN); r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, &rdst->resource, diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 7961a96b67e..8eb0c6806b9 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -466,7 +466,7 @@ void r600_dma_copy_buffer(struct r600_context *rctx, r600_need_dma_space(&rctx->b, ncopy * 5); for (i = 0; i < ncopy; i++) { csize = size < R600_DMA_COPY_MAX_SIZE_DW ? size : R600_DMA_COPY_MAX_SIZE_DW; - /* emit reloc before writting cs so that cs is always in consistent state */ + /* emit reloc before writing cs so that cs is always in consistent state */ r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, rsrc, RADEON_USAGE_READ, RADEON_PRIO_MIN); r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, rdst, RADEON_USAGE_WRITE, diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 30514454f69..960dfcedfef 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -2900,7 +2900,7 @@ static boolean r600_dma_copy_tile(struct r600_context *rctx, for (i = 0; i < ncopy; i++) { cheight = cheight > copy_height ? copy_height : cheight; size = (cheight * pitch) / 4; - /* emit reloc before writting cs so that cs is always in consistent state */ + /* emit reloc before writing cs so that cs is always in consistent state */ r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, &rsrc->resource, RADEON_USAGE_READ, RADEON_PRIO_MIN); r600_context_bo_reloc(&rctx->b, &rctx->b.rings.dma, &rdst->resource, RADEON_USAGE_WRITE, diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c index a4778dfb7bf..c50c7055851 100644 --- a/src/gallium/drivers/r600/r600_state_common.c +++ b/src/gallium/drivers/r600/r600_state_common.c @@ -288,9 +288,9 @@ static void r600_bind_dsa_state(struct pipe_context *ctx, void *state) if (rctx->zwritemask != dsa->zwritemask) { rctx->zwritemask = dsa->zwritemask; if (rctx->b.chip_class >= EVERGREEN) { - /* work around some issue when not writting to zbuffer + /* work around some issue when not writing to zbuffer * we are having lockup on evergreen so do not enable - * hyperz when not writting zbuffer + * hyperz when not writing zbuffer */ rctx->db_misc_state.atom.dirty = true; } diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index ec649c9c43b..bf156f9b42d 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -1398,7 +1398,7 @@ emit_frag_end(struct vc4_compile *c) } /* Save the packed value for logic ops. Can't reuse r4 - * becuase other things might smash it (like sRGB) + * because other things might smash it (like sRGB) */ packed_dst_color = qir_MOV(c, r4); } diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index a0ee59c28de..2f5e1f5f1a8 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -243,7 +243,7 @@ bits_per_pixel( XMesaVisual xmv ) * Do this by calling XGetWindowAttributes() for the window and * checking if we catch an X error. * Input: dpy - the display - * win - the window to check for existance + * win - the window to check for existence * Return: GL_TRUE - window exists * GL_FALSE - window doesn't exist */ diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index 296d6dcd474..2a851546000 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -182,7 +182,7 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, This->mode = NULL; } - /* Note: It is the role of the backend to fill if neccessary + /* Note: It is the role of the backend to fill if necessary * BackBufferWidth and BackBufferHeight */ ID3DPresent_SetPresentParameters(This->present, pParams, This->mode); diff --git a/src/gallium/state_trackers/vdpau/device.c b/src/gallium/state_trackers/vdpau/device.c index efc1fdeb190..ba36afc9421 100644 --- a/src/gallium/state_trackers/vdpau/device.c +++ b/src/gallium/state_trackers/vdpau/device.c @@ -248,7 +248,7 @@ vlVdpGetProcAddress(VdpDevice device, VdpFuncId function_id, void **function_poi if (!vlGetFuncFTAB(function_id, function_pointer)) return VDP_STATUS_INVALID_FUNC_ID; - VDPAU_MSG(VDPAU_TRACE, "[VDPAU] Got proc adress %p for id %d\n", *function_pointer, function_id); + VDPAU_MSG(VDPAU_TRACE, "[VDPAU] Got proc address %p for id %d\n", *function_pointer, function_id); return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/wgl/stw_framebuffer.h b/src/gallium/state_trackers/wgl/stw_framebuffer.h index 2b7d173af1a..28962c8cbd5 100644 --- a/src/gallium/state_trackers/wgl/stw_framebuffer.h +++ b/src/gallium/state_trackers/wgl/stw_framebuffer.h @@ -101,7 +101,7 @@ struct stw_framebuffer * acquiring the stw_framebuffer::mutex of the framebuffer to be deleted. * This ensures that nobody else is reading/writing to the. * - * It is not necessary to aquire the mutex above to navigate the linked list + * It is not necessary to acquire the mutex above to navigate the linked list * given that deletions are done with stw_device::fb_mutex held, so no other * thread can delete. */ diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c index 888aebb2bdc..b17dabc6ce5 100644 --- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c +++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c @@ -286,7 +286,7 @@ fenced_buffer_remove_locked(struct fenced_manager *fenced_mgr, /** * Wait for the fence to expire, and remove it from the fenced list. * - * This function will release and re-aquire the mutex, so any copy of mutable + * This function will release and re-acquire the mutex, so any copy of mutable * state must be discarded after calling it. */ static INLINE enum pipe_error @@ -321,7 +321,7 @@ fenced_buffer_finish_locked(struct fenced_manager *fenced_mgr, /* * Only proceed if the fence object didn't change in the meanwhile. * Otherwise assume the work has been already carried out by another - * thread that re-aquired the lock before us. + * thread that re-acquired the lock before us. */ proceed = fence == fenced_buf->fence ? TRUE : FALSE; |