diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
| commit | 5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch) | |
| tree | b7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/main/enable.c | |
| parent | 97f357506241a5314de9071befcd01be731f1dbb (diff) | |
| parent | 0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff) | |
| download | vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2 vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/enable.c')
| -rw-r--r-- | mesalib/src/mesa/main/enable.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index 4bf1809e7..ba24ca77c 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -1016,6 +1016,7 @@ GLboolean GLAPIENTRY _mesa_IsEnabledIndexed( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); switch (cap) { case GL_BLEND: if (index >= ctx->Const.MaxDrawBuffers) { @@ -1072,6 +1073,8 @@ GLboolean GLAPIENTRY _mesa_IsEnabled( GLenum cap ) { GET_CURRENT_CONTEXT(ctx); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); + switch (cap) { case GL_ALPHA_TEST: return ctx->Color.AlphaEnabled; |