summaryrefslogtreecommitdiffstats
path: root/src/glx
diff options
context:
space:
mode:
Diffstat (limited to 'src/glx')
-rw-r--r--src/glx/XF86dri.c2
-rw-r--r--src/glx/apple/apple_glx.c2
-rw-r--r--src/glx/apple/apple_glx_context.c2
-rw-r--r--src/glx/apple/apple_glx_surface.c4
-rw-r--r--src/glx/glxcmds.c2
-rw-r--r--src/glx/indirect_vertex_array.c2
-rw-r--r--src/glx/single2.c10
7 files changed, 12 insertions, 12 deletions
diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c
index b39fb205388..885ec93db55 100644
--- a/src/glx/XF86dri.c
+++ b/src/glx/XF86dri.c
@@ -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
diff --git a/src/glx/apple/apple_glx.c b/src/glx/apple/apple_glx.c
index 3b570882572..a08c205eb96 100644
--- a/src/glx/apple/apple_glx.c
+++ b/src/glx/apple/apple_glx.c
@@ -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)
{
diff --git a/src/glx/apple/apple_glx_context.c b/src/glx/apple/apple_glx_context.c
index 8a6ded28aa2..5650b4f3291 100644
--- a/src/glx/apple/apple_glx_context.c
+++ b/src/glx/apple/apple_glx_context.c
@@ -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)
diff --git a/src/glx/apple/apple_glx_surface.c b/src/glx/apple/apple_glx_surface.c
index 915520286b0..51583bb40bc 100644
--- a/src/glx/apple/apple_glx_surface.c
+++ b/src/glx/apple/apple_glx_surface.c
@@ -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,
diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
index f4f476e10b0..26ff804297f 100644
--- a/src/glx/glxcmds.c
+++ b/src/glx/glxcmds.c
@@ -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)
diff --git a/src/glx/indirect_vertex_array.c b/src/glx/indirect_vertex_array.c
index 0025cbbd078..2bf2ff1bdb6 100644
--- a/src/glx/indirect_vertex_array.c
+++ b/src/glx/indirect_vertex_array.c
@@ -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.
*/
diff --git a/src/glx/single2.c b/src/glx/single2.c
index 54f51ad7fd8..2a1bf06bc0a 100644
--- a/src/glx/single2.c
+++ b/src/glx/single2.c
@@ -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.
*/
}