aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-17 09:22:05 +0100
committermarha <marha@users.sourceforge.net>2013-01-17 09:22:05 +0100
commit4fc6b34d1c14cc61f553ca59264d0909656933f3 (patch)
treeb6dd33c595a9eb22ecb2f2f2630abfa12772d6c5 /mesalib/src/mesa/main
parent811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff)
downloadvcxsrv-4fc6b34d1c14cc61f553ca59264d0909656933f3.tar.gz
vcxsrv-4fc6b34d1c14cc61f553ca59264d0909656933f3.tar.bz2
vcxsrv-4fc6b34d1c14cc61f553ca59264d0909656933f3.zip
fontconfig libxcb mesa xkbcomp git update 17 jan 2013
fontconfig: 671bcb34e23ed03b1f564af35560db81f8b12b96 libxcb: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 mesa: 56c01d81094795286828ecb83713e043695e905a xkbcomp: ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/formatquery.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/formatquery.c b/mesalib/src/mesa/main/formatquery.c
index f08ab66f0..bd895e874 100644
--- a/mesalib/src/mesa/main/formatquery.c
+++ b/mesalib/src/mesa/main/formatquery.c
@@ -22,6 +22,7 @@
*/
#include "mtypes.h"
+#include "context.h"
#include "glformats.h"
#include "macros.h"
#include "mfeatures.h"
@@ -37,6 +38,8 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname,
GLsizei count = 0;
GET_CURRENT_CONTEXT(ctx);
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
if (!ctx->Extensions.ARB_internalformat_query) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetInternalformativ");
return;