aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-03-29 07:22:59 +0000
committermarha <marha@users.sourceforge.net>2011-03-29 07:22:59 +0000
commit2ed8e0e263e27934ba97c00d4820dab5ec08b548 (patch)
tree8ec0340f8100b6824afc3592a586b97d669f0256 /mesalib/src
parent87027d4d788c04d3f721b27eb718207bbf30f61c (diff)
parent24abc56b37a3ec32a03b7eafccd96607ae13ea89 (diff)
downloadvcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.tar.gz
vcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.tar.bz2
vcxsrv-2ed8e0e263e27934ba97c00d4820dab5ec08b548.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src')
-rw-r--r--mesalib/src/mesa/main/fbobject.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 0bffbcfae..b71bc53e1 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -2321,7 +2321,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
if ((mask & (GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT))
&& filter != GL_NEAREST) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glBlitFramebufferEXT(depth/stencil requires GL_NEAREST filter");
+ "glBlitFramebufferEXT(depth/stencil requires GL_NEAREST filter)");
return;
}
@@ -2342,7 +2342,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
_mesa_get_format_bits(readRb->Format, GL_STENCIL_BITS) !=
_mesa_get_format_bits(drawRb->Format, GL_STENCIL_BITS)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glBlitFramebufferEXT(stencil buffer size mismatch");
+ "glBlitFramebufferEXT(stencil buffer size mismatch)");
return;
}
}
@@ -2355,7 +2355,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
_mesa_get_format_bits(readRb->Format, GL_DEPTH_BITS) !=
_mesa_get_format_bits(drawRb->Format, GL_DEPTH_BITS)) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glBlitFramebufferEXT(depth buffer size mismatch");
+ "glBlitFramebufferEXT(depth buffer size mismatch)");
return;
}
}
@@ -2374,7 +2374,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
if (srcX1 - srcX0 != dstX1 - dstX0 ||
srcY1 - srcY0 != dstY1 - dstY0) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glBlitFramebufferEXT(bad src/dst multisample region sizes");
+ "glBlitFramebufferEXT(bad src/dst multisample region sizes)");
return;
}
@@ -2383,7 +2383,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
colorDrawRb &&
colorReadRb->Format != colorDrawRb->Format) {
_mesa_error(ctx, GL_INVALID_OPERATION,
- "glBlitFramebufferEXT(bad src/dst multisample pixel formats");
+ "glBlitFramebufferEXT(bad src/dst multisample pixel formats)");
return;
}
}