diff options
Diffstat (limited to 'src/mesa')
28 files changed, 38 insertions, 38 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index 13adf560835..ea54e2b25b1 100644 --- a/src/mesa/drivers/dri/i915/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c @@ -219,9 +219,9 @@ i830AlphaFunc(struct gl_context * ctx, GLenum func, GLfloat ref) } /** - * Makes sure that the proper enables are set for LogicOp, Independant Alpha + * Makes sure that the proper enables are set for LogicOp, Independent Alpha * Blend, and Blending. It needs to be called from numerous places where we - * could change the LogicOp or Independant Alpha Blend without subsequent + * could change the LogicOp or Independent Alpha Blend without subsequent * calls to glEnable. * * \todo @@ -369,7 +369,7 @@ i830_set_blend_state(struct gl_context * ctx) } /* This will catch a logicop blend equation. It will also ensure - * independant alpha blend is really in the correct state (either enabled + * independent alpha blend is really in the correct state (either enabled * or disabled) if blending is already enabled. */ diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index f12bf8af991..5f10b840b1a 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -197,9 +197,9 @@ i915AlphaFunc(struct gl_context * ctx, GLenum func, GLfloat ref) } /* This function makes sure that the proper enables are - * set for LogicOp, Independant Alpha Blend, and Blending. + * set for LogicOp, Independent Alpha Blend, and Blending. * It needs to be called from numerous places where we - * could change the LogicOp or Independant Alpha Blend without subsequent + * could change the LogicOp or Independent Alpha Blend without subsequent * calls to glEnable. */ static void diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 1bbd58fbfd4..350d35d9033 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -248,7 +248,7 @@ struct intel_context intel_tri_func draw_tri; /** - * Set if rendering has occured to the drawable's front buffer. + * Set if rendering has occurred to the drawable's front buffer. * * This is used in the DRI2 case to detect that glFlush should also copy * the contents of the fake front buffer to the real front buffer. diff --git a/src/mesa/drivers/dri/i915/intel_tex_layout.c b/src/mesa/drivers/dri/i915/intel_tex_layout.c index 647a2f8b31f..01ea165c756 100644 --- a/src/mesa/drivers/dri/i915/intel_tex_layout.c +++ b/src/mesa/drivers/dri/i915/intel_tex_layout.c @@ -136,7 +136,7 @@ void i945_miptree_layout_2d(struct intel_mipmap_tree *mt) mt->total_width = ALIGN(mt->physical_width0, mt->align_w); } - /* May need to adjust width to accomodate the placement of + /* May need to adjust width to accommodate the placement of * the 2nd mipmap. This occurs when the alignment * constraints of mipmap placement push the right edge of the * 2nd mipmap out past the width of its parent. diff --git a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c index 8fe1c0afa03..6baf620a1a7 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_unfilled.c +++ b/src/mesa/drivers/dri/i965/brw_clip_unfilled.c @@ -135,9 +135,9 @@ static void copy_bfc( struct brw_clip_compile *c ) brw_clip_have_varying(c, VARYING_SLOT_BFC1))) return; - /* In some wierd degnerate cases we can end up testing the + /* In some weird degenerate cases we can end up testing the * direction twice, once for culling and once for bfc copying. Oh - * well, that's what you get for setting wierd GL state. + * well, that's what you get for setting weird GL state. */ if (c->key.copy_bfc_ccw) conditional = BRW_CONDITIONAL_GE; @@ -278,7 +278,7 @@ static void emit_lines(struct brw_clip_compile *c, struct brw_indirect v0ptr = brw_indirect(2, 0); struct brw_indirect v1ptr = brw_indirect(3, 0); - /* Need a seperate loop for offset: + /* Need a separate loop for offset: */ if (do_offset) { brw_MOV(p, c->reg.loopcount, c->reg.nr_verts); diff --git a/src/mesa/drivers/dri/i965/brw_clip_util.c b/src/mesa/drivers/dri/i965/brw_clip_util.c index b7c48014594..40ad14402a7 100644 --- a/src/mesa/drivers/dri/i965/brw_clip_util.c +++ b/src/mesa/drivers/dri/i965/brw_clip_util.c @@ -336,10 +336,10 @@ void brw_clip_emit_vue(struct brw_clip_compile *c, brw_MOV(p, get_element_ud(c->reg.R0, 2), brw_imm_ud(header)); - /* Send each vertex as a seperate write to the urb. This + /* Send each vertex as a separate write to the urb. This * is different to the concept in brw_sf_emit.c, where * subsequent writes are used to build up a single urb - * entry. Each of these writes instantiates a seperate + * entry. Each of these writes instantiates a separate * urb entry - (I think... what about 'allocate'?) */ brw_urb_WRITE(p, diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 9d903609a8b..0f2f9ad7d34 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -599,7 +599,7 @@ brw_initialize_context_constants(struct brw_context *brw) ctx->Const.MaxViewports = GEN7_NUM_VIEWPORTS; ctx->Const.ViewportSubpixelBits = 0; - /* Cast to float before negating becuase MaxViewportWidth is unsigned. + /* Cast to float before negating because MaxViewportWidth is unsigned. */ ctx->Const.ViewportBounds.Min = -(float)ctx->Const.MaxViewportWidth; ctx->Const.ViewportBounds.Max = ctx->Const.MaxViewportWidth; @@ -974,7 +974,7 @@ intelUnbindContext(__DRIcontext * driContextPriv) * sRGB encode if the renderbuffer can handle it. You can ask specifically * for a visual where you're guaranteed to be capable, but it turns out that * everyone just makes all their ARGB8888 visuals capable and doesn't offer - * incapable ones, becuase there's no difference between the two in resources + * incapable ones, because there's no difference between the two in resources * used. Applications thus get built that accidentally rely on the default * visual choice being sRGB, so we make ours sRGB capable. Everything sounds * great... diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index d4b7b556de0..8db1028d9fb 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1028,7 +1028,7 @@ struct brw_context * Number of resets observed in the system at context creation. * * This is tracked in the context so that we can determine that another - * reset has occured. + * reset has occurred. */ uint32_t reset_count; @@ -1041,7 +1041,7 @@ struct brw_context } upload; /** - * Set if rendering has occured to the drawable's front buffer. + * Set if rendering has occurred to the drawable's front buffer. * * This is used in the DRI2 case to detect that glFlush should also copy * the contents of the fake front buffer to the real front buffer. diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c index 26b433bddbd..1ffd332f57e 100644 --- a/src/mesa/drivers/dri/i965/brw_eu_emit.c +++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c @@ -1287,7 +1287,7 @@ get_inner_do_insn(struct brw_codegen *p) * * When the matching 'else' instruction is reached (presumably by * countdown of the instruction count patched in by our ELSE/ENDIF - * functions), the relevent flags are inverted. + * functions), the relevant flags are inverted. * * When the matching 'endif' instruction is reached, the flags are * popped off. If the stack is now empty, normal execution resumes. @@ -1559,7 +1559,7 @@ brw_ENDIF(struct brw_codegen *p) emit_endif = false; /* - * A single next_insn() may change the base adress of instruction store + * A single next_insn() may change the base address of instruction store * memory(p->store), so call it first before referencing the instruction * store pointer from an index */ diff --git a/src/mesa/drivers/dri/i965/brw_tex_layout.c b/src/mesa/drivers/dri/i965/brw_tex_layout.c index d1ac3ed53b1..274040b1c3e 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_layout.c +++ b/src/mesa/drivers/dri/i965/brw_tex_layout.c @@ -205,7 +205,7 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt) mt->total_width = ALIGN(mt->physical_width0, mt->align_w); } - /* May need to adjust width to accomodate the placement of + /* May need to adjust width to accommodate the placement of * the 2nd mipmap. This occurs when the alignment * constraints of mipmap placement push the right edge of the * 2nd mipmap out past the width of its parent. diff --git a/src/mesa/drivers/dri/i965/brw_wm_state.c b/src/mesa/drivers/dri/i965/brw_wm_state.c index 28a4aa43d83..0cd439046b3 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_state.c @@ -210,7 +210,7 @@ brw_upload_wm_unit(struct brw_context *brw) /* _NEW_POLYGON */ if (ctx->Polygon.OffsetFill) { wm->wm5.depth_offset = 1; - /* Something wierd going on with legacy_global_depth_bias, + /* Something weird going on with legacy_global_depth_bias, * offset_constant, scaling and MRD. This value passes glean * but gives some odd results elsewere (eg. the * quad-offset-units test). diff --git a/src/mesa/drivers/dri/i965/gen7_sol_state.c b/src/mesa/drivers/dri/i965/gen7_sol_state.c index 3f99df9dd91..aec4f44bb73 100644 --- a/src/mesa/drivers/dri/i965/gen7_sol_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sol_state.c @@ -164,7 +164,7 @@ gen7_upload_3dstate_so_decl_list(struct brw_context *brw, * for fake "hole" components, rather than simply taking the offset * for each real varying. Each hole can have size 1, 2, 3, or 4; we * program as many size = 4 holes as we can, then a final hole to - * accomodate the final 1, 2, or 3 remaining. + * accommodate the final 1, 2, or 3 remaining. */ int skip_components = linked_xfb_info->Outputs[i].DstOffset - next_offset[buffer]; diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h index 4c1f1ac698e..25a9dd37682 100644 --- a/src/mesa/drivers/dri/r200/r200_ioctl.h +++ b/src/mesa/drivers/dri/r200/r200_ioctl.h @@ -78,7 +78,7 @@ do { \ rmesa->radeon.dma.flush( &rmesa->radeon.glCtx ); \ } while (0) -/* Can accomodate several state changes and primitive changes without +/* Can accommodate several state changes and primitive changes without * actually firing the buffer. */ #define R200_STATECHANGE( rmesa, ATOM ) \ diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index cc13ccb4d65..ab84d1752ba 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -1453,7 +1453,7 @@ static void setup_hardware_state(r200ContextPtr rmesa, radeonTexObj *t) */ t->pp_txformat_x |= R200_TEXCOORD_PROJ; } - /* FIXME: NPOT sizes, Is it correct realy? */ + /* FIXME: NPOT sizes, is it correct really? */ t->pp_txsize = (((firstImage->Width - 1) << R200_PP_TX_WIDTHMASK_SHIFT) | ((firstImage->Height - 1) << R200_PP_TX_HEIGHTMASK_SHIFT)); diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.h b/src/mesa/drivers/dri/radeon/radeon_common_context.h index 8a1c61ad80b..dc72592b90c 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.h +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.h @@ -433,7 +433,7 @@ struct radeon_context { GLboolean front_cliprects; /** - * Set if rendering has occured to the drawable's front buffer. + * Set if rendering has occurred to the drawable's front buffer. * * This is used in the DRI2 case to detect that glFlush should also copy * the contents of the fake front buffer to the real front buffer. diff --git a/src/mesa/drivers/dri/radeon/radeon_ioctl.h b/src/mesa/drivers/dri/radeon/radeon_ioctl.h index 4d24e5f6a26..2fe0e5756a5 100644 --- a/src/mesa/drivers/dri/radeon/radeon_ioctl.h +++ b/src/mesa/drivers/dri/radeon/radeon_ioctl.h @@ -95,7 +95,7 @@ do { \ rmesa->radeon.dma.flush( &rmesa->radeon.glCtx ); \ } while (0) -/* Can accomodate several state changes and primitive changes without +/* Can accommodate several state changes and primitive changes without * actually firing the buffer. */ diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 681b81ac762..65e7ca89d32 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -196,7 +196,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/mesa/main/context.c b/src/mesa/main/context.c index adf64976e5e..f36fb8dd66c 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -936,7 +936,7 @@ alloc_dispatch_table(void) { /* Find the larger of Mesa's dispatch table and libGL's dispatch table. * In practice, this'll be the same for stand-alone Mesa. But for DRI - * Mesa we do this to accomodate different versions of libGL and various + * Mesa we do this to accommodate different versions of libGL and various * DRI drivers. */ GLint numEntries = MAX2(_glapi_get_dispatch_table_size(), _gloffset_COUNT); diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index edf7e339087..7fdd9bab6ff 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -1657,7 +1657,7 @@ _mesa_get_fixed_func_vertex_program(struct gl_context *ctx) struct gl_vertex_program *prog; struct state_key key; - /* Grab all the relevent state and put it in a single structure: + /* Grab all the relevant state and put it in a single structure: */ make_state_key(ctx, &key); diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c index 2bc8bcad90b..8af44e90520 100644 --- a/src/mesa/main/formats.c +++ b/src/mesa/main/formats.c @@ -811,7 +811,7 @@ _mesa_format_image_size(mesa_format format, GLsizei width, /** * Same as _mesa_format_image_size() but returns a 64-bit value to - * accomodate very large textures. + * accommodate very large textures. */ uint64_t _mesa_format_image_size64(mesa_format format, GLsizei width, diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index 0475a7ab234..ecf564c0089 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -50,7 +50,7 @@ /*@{*/ #define MAT_FLAG_IDENTITY 0 /**< is an identity matrix flag. * (Not actually used - the identity - * matrix is identified by the absense + * matrix is identified by the absence * of all other flags.) */ #define MAT_FLAG_GENERAL 0x1 /**< is a general matrix flag */ diff --git a/src/mesa/program/hash_table.h b/src/mesa/program/hash_table.h index eed2e55dc29..e85a836a00b 100644 --- a/src/mesa/program/hash_table.h +++ b/src/mesa/program/hash_table.h @@ -116,8 +116,8 @@ extern void hash_table_insert(struct hash_table *ht, void *data, * Add an element to a hash table with replacement * * \return - * 1 if it did replace the the value (in which case the old key is kept), 0 if - * it did not replace the value (in which case the new key is kept). + * 1 if it did replace the value (in which case the old key is kept), 0 if it + * did not replace the value (in which case the new key is kept). * * \warning * If \c key is already in the hash table, \c data will \b replace the most diff --git a/src/mesa/program/prog_cache.c b/src/mesa/program/prog_cache.c index 34609f05696..ed93af7f13a 100644 --- a/src/mesa/program/prog_cache.c +++ b/src/mesa/program/prog_cache.c @@ -77,7 +77,7 @@ hash_key(const void *key, GLuint key_size) /** - * Rebuild/expand the hash table to accomodate more entries + * Rebuild/expand the hash table to accommodate more entries */ static void rehash(struct gl_program_cache *cache) diff --git a/src/mesa/state_tracker/st_cb_flush.c b/src/mesa/state_tracker/st_cb_flush.c index 6df4300499c..ca51eeee366 100644 --- a/src/mesa/state_tracker/st_cb_flush.c +++ b/src/mesa/state_tracker/st_cb_flush.c @@ -152,7 +152,7 @@ void st_init_flush_functions(struct dd_function_table *functions) * Finish() is identical to Flush() in all cases - no differences in * rendering or ReadPixels are visible if we opt not to wait here. * - * Only set this up on windows to avoid suprise elsewhere. + * Only set this up on Windows to avoid surprise elsewhere. */ #ifdef PIPE_OS_WINDOWS functions->Finish = st_glFlush; diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 0adb8e5ba0d..453bd36367b 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -645,7 +645,7 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span ) /* * Must do all texture sampling before combining in order to - * accomodate GL_ARB_texture_env_crossbar. + * accommodate GL_ARB_texture_env_crossbar. */ for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) { const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; diff --git a/src/mesa/tnl/t_vertex.h b/src/mesa/tnl/t_vertex.h index 36d8a969e66..a84b299e518 100644 --- a/src/mesa/tnl/t_vertex.h +++ b/src/mesa/tnl/t_vertex.h @@ -40,7 +40,7 @@ struct tnl_clipspace; /* It will probably be necessary to allow drivers to specify new - * emit-styles to cover all the wierd and wacky things out there. + * emit-styles to cover all the weird and wacky things out there. */ enum tnl_attr_format { EMIT_1F, diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 859078f121c..48680ec8899 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -685,7 +685,7 @@ static void GLAPIENTRY vbo_exec_Begin( GLenum mode ) return; } - /* Heuristic: attempt to isolate attributes occuring outside + /* Heuristic: attempt to isolate attributes occurring outside * begin/end pairs. */ if (exec->vtx.vertex_size && !exec->vtx.attrsz[0]) diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 74e266d191c..de744e0c763 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -278,7 +278,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data) goto end; } else if (save->replay_flags) { - /* Various degnerate cases: translate into immediate mode + /* Various degenerate cases: translate into immediate mode * calls rather than trying to execute in place. */ vbo_save_loopback_vertex_list( ctx, node ); |