From 67cde39c8c6734d7dd05b53dfcf4a6f3133ca577 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 16 Jul 2019 11:20:42 +0200 Subject: [PATCH] zink: move set_active_query_state-stub to zink_query.c Acked-by: Jordan Justen --- src/gallium/drivers/zink/zink_context.c | 6 ------ src/gallium/drivers/zink/zink_query.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 77b57c1397c..03f5d1b6c9b 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -655,11 +655,6 @@ zink_set_framebuffer_state(struct pipe_context *pctx, } } -static void -zink_set_active_query_state(struct pipe_context *pctx, bool enable) -{ -} - static void zink_set_blend_color(struct pipe_context *pctx, const struct pipe_blend_color *color) @@ -1410,7 +1405,6 @@ zink_context_create(struct pipe_screen *pscreen, void *priv, unsigned flags) ctx->base.set_framebuffer_state = zink_set_framebuffer_state; ctx->base.set_stencil_ref = zink_set_stencil_ref; ctx->base.set_clip_state = zink_set_clip_state; - ctx->base.set_active_query_state = zink_set_active_query_state; ctx->base.set_blend_color = zink_set_blend_color; ctx->base.set_sample_mask = zink_set_sample_mask; diff --git a/src/gallium/drivers/zink/zink_query.c b/src/gallium/drivers/zink/zink_query.c index ee9837332ba..d5fc8005915 100644 --- a/src/gallium/drivers/zink/zink_query.c +++ b/src/gallium/drivers/zink/zink_query.c @@ -150,6 +150,11 @@ zink_get_query_result(struct pipe_context *pctx, return TRUE; } +static void +zink_set_active_query_state(struct pipe_context *pctx, bool enable) +{ +} + void zink_context_query_init(struct pipe_context *pctx) { @@ -158,4 +163,5 @@ zink_context_query_init(struct pipe_context *pctx) pctx->begin_query = zink_begin_query; pctx->end_query = zink_end_query; pctx->get_query_result = zink_get_query_result; + pctx->set_active_query_state = zink_set_active_query_state; } -- 2.30.2