KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few typos 

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Zoë Blade 2015-04-22 11:33:17 +01:00 committed by Francisco Jerez
parent e17dc004fd
commit 05e7f7f438
78 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/VERSIONS
View File

@ -103,7 +103,7 @@ Mesa Version History
- Stencil-related functions now work in display lists
Changes:
- renamed aux.h as glaux.h (MS-DOS names can't start with aux)
- most filenames are in 8.3 format to accomodate MS-DOS
- most filenames are in 8.3 format to accommodate MS-DOS
- use GLubytes to store arrays of colors instead of GLints
1.2.2 August 2, 1995
@ -1007,7 +1007,7 @@ Mesa Version History
- glGetTexImage was using pixel unpacking instead of packing params
- auto-mipmap generation for cube maps was incorrect
Changes:
- max texture units reduced to six to accomodate texture rectangles
- max texture units reduced to six to accommodate texture rectangles
- removed unfinished GL_MESA_sprite_point extension code

2
docs/index.html
View File

@ -1366,7 +1366,7 @@ The <a href="faq.html">Mesa FAQ</a> has been rewritten.
- glGetTexImage was using pixel unpacking instead of packing params
- auto-mipmap generation for cube maps was incorrect
Changes:
- max texture units reduced to six to accomodate texture rectangles
- max texture units reduced to six to accommodate texture rectangles
- removed unfinished GL_MESA_sprite_point extension code
</pre>

2
docs/libGL.txt
View File

@ -49,7 +49,7 @@ stderr if the LIBGL_DEBUG environment variable is defined.
libGL.so is thread safe. The overhead of thread safety for common,
single-thread clients is negligible. However, the overhead of thread
safety for multi-threaded clients is significant. Each GL API call
requires two calls to pthread_get_specific() which can noticably
requires two calls to pthread_get_specific() which can noticeably
impact performance. Warning: libGL.so is thread safe but individual
DRI drivers may not be. Please consult the documentation for a driver
to learn if it is thread safe.

2
docs/relnotes/10.0.3.html
View File

@ -104,7 +104,7 @@ a07b4b6b9eb449b88a6cb5061e51c331 MesaLib-10.0.3.zip
<li>Add md5sums for 10.0.2. release.</li>
<li>cherry-ignore: Ignore several patches not yet ready for the stable branch</li>
<li>Drop another couple of patches.</li>
<li>cherry-ignore: Ignore 4 patches at teh request of the author, (Anuj).</li>
<li>cherry-ignore: Ignore 4 patches at the request of the author, (Anuj).</li>
<li>Update version to 10.0.3</li>
</ul>

2
docs/relnotes/7.10.html
View File

@ -1693,7 +1693,7 @@ bc644be551ed585fc4f66c16b64a91c9 MesaGLUT-7.10.tar.gz
<li>llvmpipe: Special case complementary and identify blend factors in SoA.</li>
<li>llvmpipe: Make rgb/alpha bland func/factors match, when there is no alpha.</li>
<li>draw: Prevent clipped vertices overflow.</li>
<li>draw: Fullfil the new min_lod/max_lod/lod_bias/border_color dynamic state</li>
<li>draw: Fulfil the new min_lod/max_lod/lod_bias/border_color dynamic state</li>
<li>gallivm: Fetch the lod from the dynamic state when min_lod == max_lod.</li>
<li>gallivm: Remove dead experimental code.</li>
<li>llvmpipe: Decouple sampler view and sampler state updates.</li>

4
docs/versions.html
View File

@ -150,7 +150,7 @@ New features:
Changes:
<ul>
<li>renamed aux.h as glaux.h (MS-DOS names can't start with aux)
<li>most filenames are in 8.3 format to accomodate MS-DOS
<li>most filenames are in 8.3 format to accommodate MS-DOS
<li>use GLubytes to store arrays of colors instead of GLints
</ul>
@ -1224,7 +1224,7 @@ Bug fixes:
</ul>
Changes:
<ul>
<li>max texture units reduced to six to accomodate texture rectangles
<li>max texture units reduced to six to accommodate texture rectangles
<li>removed unfinished GL_MESA_sprite_point extension code
</ul>

2
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
View File

@ -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

2
src/gallium/auxiliary/rbug/rbug_connection.c
View File

@ -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)

2
src/gallium/drivers/i915/i915_prim_vbuf.c
View File

@ -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;

2
src/gallium/drivers/i915/i915_resource_texture.c
View File

@ -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.

2
src/gallium/drivers/i915/i915_state_dynamic.c
View File

@ -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 */
};

2
src/gallium/drivers/i915/i915_state_immediate.c
View File

@ -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 */
};

2
src/gallium/drivers/llvmpipe/lp_rast.c
View File

@ -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
*/

2
src/gallium/drivers/llvmpipe/lp_scene.h
View File

@ -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)

2
src/gallium/drivers/r300/compiler/memory_pool.h
View File

@ -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;

2
src/gallium/drivers/r300/compiler/radeon_variable.c
View File

@ -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]

2
src/gallium/drivers/r300/r300_emit.c
View File

@ -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);

2
src/gallium/drivers/r300/r300_reg.h
View File

@ -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.

2
src/gallium/drivers/r300/r300_tgsi_to_rc.h
View File

@ -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;
};

2
src/gallium/drivers/r600/evergreen_hw_context.c
View File

@ -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,

2
src/gallium/drivers/r600/evergreen_state.c
View File

@ -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,

2
src/gallium/drivers/r600/r600_hw_context.c
View File

@ -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,

2
src/gallium/drivers/r600/r600_state.c
View File

@ -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,

4
src/gallium/drivers/r600/r600_state_common.c
View File

@ -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;
}

2
src/gallium/drivers/vc4/vc4_program.c
View File

@ -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);
}

2
src/gallium/state_trackers/glx/xlib/xm_api.c
View File

@ -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
*/

2
src/gallium/state_trackers/nine/swapchain9.c
View File

@ -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);

2
src/gallium/state_trackers/vdpau/device.c
View File

@ -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;
}

2
src/gallium/state_trackers/wgl/stw_framebuffer.h
View File

@ -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.
*/

4
src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c
View File

@ -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;

2
src/glsl/ast_function.cpp
View File

@ -1191,7 +1191,7 @@ emit_inline_matrix_constructor(const glsl_type *type,
*
* - Construct a matrix from an arbirary combination of vectors and
* scalars. The components of the constructor parameters are assigned
* to the matrix in colum-major order until the matrix is full.
* to the matrix in column-major order until the matrix is full.
*
* - Construct a matrix from a single matrix. The source matrix is copied
* to the upper left portion of the constructed matrix, and the remaining

2
src/glsl/glcpp/glcpp-parse.y
View File

@ -1463,7 +1463,7 @@ _arguments_parse (argument_list_t *arguments,
else {
if (argument->head == NULL) {
/* Don't treat initial whitespace as
* part of the arguement. */
* part of the argument. */
if (node->token->type == SPACE)
continue;
}

2
src/glsl/link_uniforms.cpp
View File

@ -274,7 +274,7 @@ namespace {
*
* As uniforms are added to the active set the number of active uniforms and
* the storage requirements for those uniforms are accumulated. The active
* uniforms are added the the hash table supplied to the constructor.
* uniforms are added to the hash table supplied to the constructor.
*
* If the same uniform is added multiple times (i.e., once for each shader
* target), it will only be accounted once.

8
src/glsl/lower_packing_builtins.cpp
View File

@ -569,8 +569,8 @@ private:
* return pack_uvec2_to_uint(uvec2(
* round(clamp(VEC2_RVALUE, 0.0f, 1.0f) * 65535.0f)));
*
* Here it is safe to directly convert the vec2 to uvec2 because the the
* vec2 has been clamped to a non-negative range.
* Here it is safe to directly convert the vec2 to uvec2 because the vec2
* has been clamped to a non-negative range.
*/
assert(vec2_rval->type == glsl_type::vec2_type);
@ -613,8 +613,8 @@ private:
* return pack_uvec4_to_uint(uvec4(
* round(clamp(VEC2_RVALUE, 0.0f, 1.0f) * 255.0f)));
*
* Here it is safe to directly convert the vec4 to uvec4 because the the
* vec4 has been clamped to a non-negative range.
* Here it is safe to directly convert the vec4 to uvec4 because the vec4
* has been clamped to a non-negative range.
*/
assert(vec4_rval->type == glsl_type::vec4_type);

2
src/glsl/nir/nir_from_ssa.c
View File

@ -642,7 +642,7 @@ emit_copy(nir_parallel_copy_instr *pcopy, nir_src src, nir_src dest_src,
*
* The algorithm works by playing this little shell game with the values.
* We start by recording where every source value is and which source value
* each destination value should recieve. We then grab any copy whose
* each destination value should receive. We then grab any copy whose
* destination is "empty", i.e. not used as a source, and do the following:
* - Find where its source value currently lives
* - Emit the move instruction

8
src/glsl/opt_dead_builtin_varyings.cpp
View File

@ -35,7 +35,7 @@
* the built-in varyings have pre-assigned locations. Also, the elimination
* of unused gl_TexCoord elements requires its own lowering pass anyway.
*
* It's implemented by replacing all occurences of dead varyings with
* It's implemented by replacing all occurrences of dead varyings with
* temporary variables, which creates dead code. It is recommended to run
* a dead-code elimination pass after this.
*
@ -280,7 +280,7 @@ public:
*
* We're going to break down the gl_TexCoord array into separate
* variables. First, add declarations of the new variables all
* occurences of gl_TexCoord will be replaced with.
* occurrences of gl_TexCoord will be replaced with.
*/
if (info->lower_texcoord_array) {
prepare_array(ir, this->new_texcoord, ARRAY_SIZE(this->new_texcoord),
@ -411,7 +411,7 @@ public:
* variable dereference representing gl_TexCoord[i].
*/
if (this->info->lower_texcoord_array) {
/* gl_TexCoord[i] occurence */
/* gl_TexCoord[i] occurrence */
ir_dereference_array *const da = (*rvalue)->as_dereference_array();
if (da && da->variable_referenced() ==
@ -425,7 +425,7 @@ public:
/* Same for gl_FragData. */
if (this->info->lower_fragdata_array) {
/* gl_FragData[i] occurence */
/* gl_FragData[i] occurrence */
ir_dereference_array *const da = (*rvalue)->as_dereference_array();
if (da && da->variable_referenced() == this->info->fragdata_array) {

2
src/glsl/opt_function_inlining.cpp
View File

@ -130,7 +130,7 @@ ir_call::generate_inline(ir_instruction *next_ir)
parameters[i] = sig_param->clone(ctx, ht);
parameters[i]->data.mode = ir_var_auto;
/* Remove the read-only decoration becuase we're going to write
/* Remove the read-only decoration because we're going to write
* directly to this variable. If the cloned variable is left
* read-only and the inlined function is inside a loop, the loop
* analysis code will get confused.

2
src/glx/XF86dri.c
View File

@ -440,7 +440,7 @@ XF86DRIDestroyDrawable(Display * dpy, int screen, XID drawable)
* destroyDrawable(drawable);
*
* which is a textbook race condition - the window may disappear
* from the server between checking for its existance and
* from the server between checking for its existence and
* destroying it. Instead we change the semantics of
* __DRIinterfaceMethodsRec::destroyDrawable() to succeed even if
* the windows is gone, by wrapping the destroy call in an error

2
src/glx/apple/apple_glx.c
View File

@ -93,7 +93,7 @@ apple_glx_get_client_id(void)
return id;
}
/* Return true if an error occured. */
/* Return true if an error occurred. */
bool
apple_init_glx(Display * dpy)
{

2
src/glx/apple/apple_glx_context.c
View File

@ -278,7 +278,7 @@ apple_glx_destroy_context(void **ptr, Display * dpy)
}
/* Return true if an error occured. */
/* Return true if an error occurred. */
bool
apple_glx_make_current_context(Display * dpy, void *oldptr, void *ptr,
GLXDrawable drawable)

4
src/glx/apple/apple_glx_surface.c
View File

@ -124,7 +124,7 @@ surface_destroy(Display * dpy, struct apple_glx_drawable *d)
}
}
/* Return true if an error occured. */
/* Return true if an error occurred. */
static bool
create_surface(Display * dpy, int screen, struct apple_glx_drawable *d)
{
@ -158,7 +158,7 @@ create_surface(Display * dpy, int screen, struct apple_glx_drawable *d)
return true; /* unable to create a surface. */
}
/* Return true if an error occured. */
/* Return true if an error occurred. */
/* This returns a referenced object via resultptr. */
bool
apple_glx_surface_create(Display * dpy, int screen,

2
src/glx/glxcmds.c
View File

@ -496,7 +496,7 @@ glXQueryVersion(Display * dpy, int *major, int *minor)
}
/*
** Query the existance of the GLX extension
** Query the existence of the GLX extension
*/
_X_EXPORT Bool
glXQueryExtension(Display * dpy, int *errorBase, int *eventBase)

2
src/glx/indirect_vertex_array.c
View File

@ -281,7 +281,7 @@ __glXInitVertexArrayState(struct glx_context * gc)
i += vertex_program_attribs;
/* Vertex array *must* be last becuase of the way that
/* Vertex array *must* be last because of the way that
* emit_DrawArrays_none works.
*/

10
src/glx/single2.c
View File

@ -330,7 +330,7 @@ __indirect_glGetBooleanv(GLenum val, GLboolean * b)
if (compsize == 0) {
/*
** Error occured; don't modify user's buffer.
** Error occurred; don't modify user's buffer.
*/
}
else {
@ -381,7 +381,7 @@ __indirect_glGetDoublev(GLenum val, GLdouble * d)
if (compsize == 0) {
/*
** Error occured; don't modify user's buffer.
** Error occurred; don't modify user's buffer.
*/
}
else {
@ -432,7 +432,7 @@ __indirect_glGetFloatv(GLenum val, GLfloat * f)
if (compsize == 0) {
/*
** Error occured; don't modify user's buffer.
** Error occurred; don't modify user's buffer.
*/
}
else {
@ -483,7 +483,7 @@ __indirect_glGetIntegerv(GLenum val, GLint * i)
if (compsize == 0) {
/*
** Error occured; don't modify user's buffer.
** Error occurred; don't modify user's buffer.
*/
}
else {
@ -588,7 +588,7 @@ __indirect_glRenderMode(GLenum mode)
if (reply.newMode != mode) {
/*
** Switch to new mode did not take effect, therefore an error
** occured. When an error happens the server won't send us any
** occurred. When an error happens the server won't send us any
** other data.
*/
}

2
src/gtest/include/gtest/internal/gtest-filepath.h
View File

@ -192,7 +192,7 @@ class GTEST_API_ FilePath {
void Normalize();
// Returns a pointer to the last occurence of a valid path separator in
// Returns a pointer to the last occurrence of a valid path separator in
// the FilePath. On Windows, for example, both '/' and '\' are valid path
// separators. Returns NULL if no path separator was found.
const char* FindLastPathSeparator() const;

2
src/gtest/src/gtest-filepath.cc
View File

@ -125,7 +125,7 @@ FilePath FilePath::RemoveExtension(const char* extension) const {
return *this;
}
// Returns a pointer to the last occurence of a valid path separator in
// Returns a pointer to the last occurrence of a valid path separator in
// the FilePath. On Windows, for example, both '/' and '\' are valid path
// separators. Returns NULL if no path separator was found.
const char* FilePath::FindLastPathSeparator() const {

2
src/loader/loader.h
View File

@ -43,7 +43,7 @@ loader_get_device_name_for_fd(int fd);
/* Function to get a different device than the one we are to use by default,
* if the user requests so and it is possible. The initial fd will be closed
* if neccessary. The returned fd is potentially a render-node.
* if necessary. The returned fd is potentially a render-node.
*/
int

2
src/mapi/glapi/gen/glX_proto_send.py
View File

@ -574,7 +574,7 @@ generic_%u_byte( GLint rop, const void * ptr )
print ' struct glx_context * const gc = __glXGetCurrentContext();'
# The only reason that single and vendor private commands need
# a variable called 'dpy' is becuase they use the SyncHandle
# a variable called 'dpy' is because they use the SyncHandle
# macro. For whatever brain-dead reason, that macro is hard-
# coded to use a variable called 'dpy' instead of taking a
# parameter.

2
src/mapi/glapi/gen/glX_proto_size.py
View File

@ -57,7 +57,7 @@ class glx_enum_function(object):
# Fill self.count and self.enums using the dictionary of enums
# that was passed in. The generic Get functions (e.g.,
# GetBooleanv and friends) are handled specially here. In
# the data the generic Get functions are refered to as "Get".
# the data the generic Get functions are referred to as "Get".
if func_name in ["GetIntegerv", "GetBooleanv", "GetFloatv", "GetDoublev"]:
match_name = "Get"

2
src/mapi/glapi/gen/gl_x86-64_asm.py
View File

@ -187,7 +187,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
# The x86-64 ABI divides function parameters into a couple
# classes. For the OpenGL interface, the only ones that are
# relevent are INTEGER and SSE. Basically, the first 8
# relevant are INTEGER and SSE. Basically, the first 8
# GLfloat or GLdouble parameters are placed in %xmm0 - %xmm7,
# the first 6 non-GLfloat / non-GLdouble parameters are placed
# in registers listed in int_parameters.

6
src/mesa/drivers/dri/i915/i830_state.c
View File

@ -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.
*/

4
src/mesa/drivers/dri/i915/i915_state.c
View File

@ -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

2
src/mesa/drivers/dri/i915/intel_context.h
View File

@ -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.

2
src/mesa/drivers/dri/i915/intel_tex_layout.c
View File

@ -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.

6
src/mesa/drivers/dri/i965/brw_clip_unfilled.c
View File

@ -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);

4
src/mesa/drivers/dri/i965/brw_clip_util.c
View File

@ -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,

4
src/mesa/drivers/dri/i965/brw_context.c
View File

@ -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...

4
src/mesa/drivers/dri/i965/brw_context.h
View File

@ -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.

4
src/mesa/drivers/dri/i965/brw_eu_emit.c
View File

@ -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
*/

2
src/mesa/drivers/dri/i965/brw_tex_layout.c
View File

@ -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.

2
src/mesa/drivers/dri/i965/brw_wm_state.c
View File

@ -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).

2
src/mesa/drivers/dri/i965/gen7_sol_state.c
View File

@ -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];

2
src/mesa/drivers/dri/r200/r200_ioctl.h
View File

@ -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 ) \

2
src/mesa/drivers/dri/r200/r200_texstate.c
View File

@ -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));

2
src/mesa/drivers/dri/radeon/radeon_common_context.h
View File

@ -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.

2
src/mesa/drivers/dri/radeon/radeon_ioctl.h
View File

@ -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.
*/

2
src/mesa/drivers/x11/xm_api.c
View File

@ -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
*/

2
src/mesa/main/context.c
View File

@ -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);

2
src/mesa/main/ffvertex_prog.c
View File

@ -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);

2
src/mesa/main/formats.c
View File

@ -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,

2
src/mesa/math/m_matrix.c
View File

@ -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 */

4
src/mesa/program/hash_table.h
View File

@ -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

2
src/mesa/program/prog_cache.c
View File

@ -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)

2
src/mesa/state_tracker/st_cb_flush.c
View File

@ -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;

2
src/mesa/swrast/s_texcombine.c
View File

@ -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];

2
src/mesa/tnl/t_vertex.h
View File

@ -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,

2
src/mesa/vbo/vbo_exec_api.c
View File

@ -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])

2
src/mesa/vbo/vbo_save_draw.c
View File

@ -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 );