From 64cc1876fa2c9ecd2bee4363d1db27ffc487d5f2 Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Sat, 16 Aug 2014 03:25:28 +0200 Subject: [PATCH] mesa: add ARB_conditional_render_inverted flags Also add an extension bit so we can safely enable Reviewed-by: Ilia Mirkin Reviewed-by: Roland Scheidegger Reviewed-by: Chris Forbes Signed-off-by: Tobias Klausmann --- src/mesa/main/condrender.c | 10 ++++++++-- src/mesa/main/extensions.c | 1 + src/mesa/main/mtypes.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 0ad1e5c2aee..54cd423fa94 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)); diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index c5bd7b3e917..553c01e343b 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -94,6 +94,7 @@ static const struct extension extension_table[] = { { "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 }, { "GL_ARB_compressed_texture_pixel_storage", o(dummy_true), GL, 2011 }, { "GL_ARB_compute_shader", o(ARB_compute_shader), GL, 2012 }, + { "GL_ARB_conditional_render_inverted", o(ARB_conditional_render_inverted), GL, 2014 }, { "GL_ARB_copy_buffer", o(dummy_true), GL, 2008 }, { "GL_ARB_copy_image", o(ARB_copy_image), GL, 2012 }, { "GL_ARB_conservative_depth", o(ARB_conservative_depth), GL, 2011 }, diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 97b1ad29b1c..cb2a4df4f2f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3553,6 +3553,7 @@ struct gl_extensions GLboolean ARB_clear_texture; GLboolean ARB_color_buffer_float; GLboolean ARB_compute_shader; + GLboolean ARB_conditional_render_inverted; GLboolean ARB_conservative_depth; GLboolean ARB_copy_image; GLboolean ARB_depth_buffer_float; -- 2.30.2