From 4ded964fed944e76e5c1aef149839567513e5909 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 20 Jul 2017 11:09:16 +0200 Subject: [PATCH] mesa: add end_conditional_render() render Signed-off-by: Samuel Pitoiset Reviewed-by: Timothy Arceri --- src/mesa/main/condrender.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 24a7f4b6945..051cd8f9629 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -133,18 +133,11 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode) } -void APIENTRY -_mesa_EndConditionalRender(void) +static void +end_conditional_render(struct gl_context *ctx) { - GET_CURRENT_CONTEXT(ctx); - FLUSH_VERTICES(ctx, 0x0); - if (!ctx->Extensions.NV_conditional_render || !ctx->Query.CondRenderQuery) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glEndConditionalRender()"); - return; - } - if (ctx->Driver.EndConditionalRender) ctx->Driver.EndConditionalRender(ctx, ctx->Query.CondRenderQuery); @@ -153,6 +146,20 @@ _mesa_EndConditionalRender(void) } +void APIENTRY +_mesa_EndConditionalRender(void) +{ + GET_CURRENT_CONTEXT(ctx); + + if (!ctx->Extensions.NV_conditional_render || !ctx->Query.CondRenderQuery) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glEndConditionalRender()"); + return; + } + + end_conditional_render(ctx); +} + + /** * This function is called by software rendering commands (all point, * line triangle drawing, glClear, glDrawPixels, glCopyPixels, and