iris: Move iris_resolve_conditional_render to the vtable.

It's going to be in genxml code shortly.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
This commit is contained in:
Kenneth Graunke 2019-04-01 11:46:36 -07:00
parent 6c4c7b600d
commit 975f7e4a59
3 changed files with 8 additions and 5 deletions

View file

@ -216,7 +216,7 @@ fast_clear_color(struct iris_context *ice,
* is not something that should happen often, we stall on the CPU here
* to resolve the predication, and then proceed.
*/
iris_resolve_conditional_render(ice);
ice->vtbl.resolve_conditional_render(ice);
if (ice->state.predicate == IRIS_PREDICATE_STATE_DONT_RENDER)
return;
@ -462,7 +462,7 @@ fast_clear_depth(struct iris_context *ice,
* even more complex, so the easiest thing to do when the fast clear
* depth is changing is to stall on the CPU and resolve the predication.
*/
iris_resolve_conditional_render(ice);
ice->vtbl.resolve_conditional_render(ice);
if (ice->state.predicate == IRIS_PREDICATE_STATE_DONT_RENDER)
return;

View file

@ -426,6 +426,7 @@ struct iris_vtable {
void (*rebind_buffer)(struct iris_context *ice,
struct iris_resource *res,
uint64_t old_address);
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,
@ -862,8 +863,6 @@ void iris_math_add32_gpr0(struct iris_context *ice,
struct iris_batch *batch,
uint32_t x);
void iris_resolve_conditional_render(struct iris_context *ice);
/* iris_resolve.c */
void iris_predraw_resolve_inputs(struct iris_context *ice,

View file

@ -1093,7 +1093,7 @@ iris_render_condition(struct pipe_context *ctx,
}
}
void
static void
iris_resolve_conditional_render(struct iris_context *ice)
{
struct pipe_context *ctx = (void *) ice;
@ -1113,6 +1113,8 @@ iris_resolve_conditional_render(struct iris_context *ice)
void
iris_init_query_functions(struct pipe_context *ctx)
{
struct iris_context *ice = (void *) ctx;
ctx->create_query = iris_create_query;
ctx->destroy_query = iris_destroy_query;
ctx->begin_query = iris_begin_query;
@ -1121,4 +1123,6 @@ iris_init_query_functions(struct pipe_context *ctx)
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;
ice->vtbl.resolve_conditional_render = iris_resolve_conditional_render;
}