diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index a57a0bf7bef..3a120ee6ed5 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -627,11 +627,6 @@ struct iris_context { struct iris_bo *scratch_bos[1 << 4][MESA_SHADER_STAGES]; } shaders; - struct { - struct iris_query *query; - bool condition; - } condition; - struct gen_perf_context *perf_ctx; /** Frame number for debug prints */ diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c index 548ce535a77..800a2004865 100644 --- a/src/gallium/drivers/iris/iris_query.c +++ b/src/gallium/drivers/iris/iris_query.c @@ -832,8 +832,6 @@ iris_render_condition(struct pipe_context *ctx, /* The old condition isn't relevant; we'll update it if necessary */ ice->state.compute_predicate = NULL; - ice->condition.query = q; - ice->condition.condition = condition; if (!q) { ice->state.predicate = IRIS_PREDICATE_STATE_RENDER; @@ -854,28 +852,10 @@ iris_render_condition(struct pipe_context *ctx, } } -static void -iris_resolve_conditional_render(struct iris_context *ice) -{ - struct pipe_context *ctx = (void *) ice; - struct iris_query *q = ice->condition.query; - struct pipe_query *query = (void *) q; - union pipe_query_result result; - - if (ice->state.predicate != IRIS_PREDICATE_STATE_USE_BIT) - return; - - assert(q); - - iris_get_query_result(ctx, query, true, &result); - set_predicate_enable(ice, (q->result != 0) ^ ice->condition.condition); -} - void genX(init_query)(struct iris_context *ice) { struct pipe_context *ctx = &ice->ctx; - struct iris_screen *screen = (struct iris_screen *)ctx->screen; ctx->create_query = iris_create_query; ctx->create_batch_query = iris_create_batch_query; @@ -886,6 +866,4 @@ genX(init_query)(struct iris_context *ice) ctx->get_query_result_resource = iris_get_query_result_resource; ctx->set_active_query_state = iris_set_active_query_state; ctx->render_condition = iris_render_condition; - - screen->vtbl.resolve_conditional_render = iris_resolve_conditional_render; } diff --git a/src/gallium/drivers/iris/iris_screen.h b/src/gallium/drivers/iris/iris_screen.h index ab5125b600b..2b9b43b427e 100644 --- a/src/gallium/drivers/iris/iris_screen.h +++ b/src/gallium/drivers/iris/iris_screen.h @@ -70,7 +70,6 @@ struct iris_vtable { const struct pipe_grid_info *grid); void (*rebind_buffer)(struct iris_context *ice, struct iris_resource *res); - void (*resolve_conditional_render)(struct iris_context *ice); void (*load_register_reg32)(struct iris_batch *batch, uint32_t dst, uint32_t src); void (*load_register_reg64)(struct iris_batch *batch, uint32_t dst,