aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-11 08:22:24 +0200
committermarha <marha@users.sourceforge.net>2012-06-11 08:22:24 +0200
commit080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (patch)
tree6d54a6409a4627162bddaad63186327e1ecdbad1 /mesalib/src/mesa
parent990bc3f015a4f8fce2eb918375defcd44980a845 (diff)
downloadvcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.gz
vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.tar.bz2
vcxsrv-080d1527a5358dd66ac927acbe0ec61cba7aa7e1.zip
fontconfig glproto mesa pixman git update 11 Jun 2012
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/main/bufferobj.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 36a761986..541566509 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -546,7 +546,7 @@ _mesa_buffer_unmap( struct gl_context *ctx, struct gl_buffer_object *bufObj )
/**
* Default fallback for \c dd_function_table::CopyBufferSubData().
- * Called via glCopyBuffserSubData().
+ * Called via glCopyBufferSubData().
*/
static void
_mesa_copy_buffer_subdata(struct gl_context *ctx,
@@ -1328,48 +1328,48 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
struct gl_buffer_object *src, *dst;
ASSERT_OUTSIDE_BEGIN_END(ctx);
- src = get_buffer(ctx, "glCopyBuffserSubData", readTarget);
+ src = get_buffer(ctx, "glCopyBufferSubData", readTarget);
if (!src)
return;
- dst = get_buffer(ctx, "glCopyBuffserSubData", writeTarget);
+ dst = get_buffer(ctx, "glCopyBufferSubData", writeTarget);
if (!dst)
return;
if (_mesa_bufferobj_mapped(src)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glCopyBuffserSubData(readBuffer is mapped)");
+ "glCopyBufferSubData(readBuffer is mapped)");
return;
}
if (_mesa_bufferobj_mapped(dst)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glCopyBuffserSubData(writeBuffer is mapped)");
+ "glCopyBufferSubData(writeBuffer is mapped)");
return;
}
if (readOffset < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glCopyBuffserSubData(readOffset = %d)", (int) readOffset);
+ "glCopyBufferSubData(readOffset = %d)", (int) readOffset);
return;
}
if (writeOffset < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glCopyBuffserSubData(writeOffset = %d)", (int) writeOffset);
+ "glCopyBufferSubData(writeOffset = %d)", (int) writeOffset);
return;
}
if (readOffset + size > src->Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glCopyBuffserSubData(readOffset + size = %d)",
+ "glCopyBufferSubData(readOffset + size = %d)",
(int) (readOffset + size));
return;
}
if (writeOffset + size > dst->Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glCopyBuffserSubData(writeOffset + size = %d)",
+ "glCopyBufferSubData(writeOffset + size = %d)",
(int) (writeOffset + size));
return;
}
@@ -1384,7 +1384,7 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
else {
/* overlapping src/dst is illegal */
_mesa_error(ctx, GL_INVALID_VALUE,
- "glCopyBuffserSubData(overlapping src/dst)");
+ "glCopyBufferSubData(overlapping src/dst)");
return;
}
}