aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/formatquery.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-17 09:25:28 +0100
committermarha <marha@users.sourceforge.net>2013-01-17 09:25:28 +0100
commit50c07563e17397daf040a32d8fdd3ab397e72371 (patch)
treeae9c109e16ba86a498c43ab62830bca3641a78aa /mesalib/src/mesa/main/formatquery.c
parentdc163f625ef006c8550791122bda28fb3eb67e3d (diff)
parent4fc6b34d1c14cc61f553ca59264d0909656933f3 (diff)
downloadvcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.gz
vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.tar.bz2
vcxsrv-50c07563e17397daf040a32d8fdd3ab397e72371.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libxcb mesa xkbcomp git update 17 jan 2013
Diffstat (limited to 'mesalib/src/mesa/main/formatquery.c')
-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;