summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/condrender.c
diff options
context:
space:
mode:
authorTobias Klausmann <tobias.johannes.klausmann@mni.thm.de>2014-08-16 03:25:28 +0200
committerIlia Mirkin <imirkin@alum.mit.edu>2014-08-19 08:54:35 -0400
commit64cc1876fa2c9ecd2bee4363d1db27ffc487d5f2 (patch)
tree4c15567e1a4f4f7bdb06ce18184580ddfb5c492c /src/mesa/main/condrender.c
parent1a51751e931668e36cb53fea377677347fb0fa38 (diff)
downloadexternal_mesa3d-64cc1876fa2c9ecd2bee4363d1db27ffc487d5f2.zip
external_mesa3d-64cc1876fa2c9ecd2bee4363d1db27ffc487d5f2.tar.gz
external_mesa3d-64cc1876fa2c9ecd2bee4363d1db27ffc487d5f2.tar.bz2
mesa: add ARB_conditional_render_inverted flags
Also add an extension bit so we can safely enable Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Chris Forbes <chrisf@ijw.co.nz> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Diffstat (limited to 'src/mesa/main/condrender.c')
-rw-r--r--src/mesa/main/condrender.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 0ad1e5c2..54cd423 100644
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -77,8 +77,14 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
case GL_QUERY_NO_WAIT:
case GL_QUERY_BY_REGION_WAIT:
case GL_QUERY_BY_REGION_NO_WAIT:
- /* OK */
- break;
+ break; /* OK */
+ case GL_QUERY_WAIT_INVERTED:
+ case GL_QUERY_NO_WAIT_INVERTED:
+ case GL_QUERY_BY_REGION_WAIT_INVERTED:
+ case GL_QUERY_BY_REGION_NO_WAIT_INVERTED:
+ if (ctx->Extensions.ARB_conditional_render_inverted)
+ break; /* OK */
+ /* fallthrough - invalid */
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",
_mesa_lookup_enum_by_nr(mode));