nir: fix serialization of loop/if control

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Fixes: e76ae39ae2 ("nir: add support for user defined select control")
Fixes: b56451f82c ("nir: add support for user defined loop control")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12778>
This commit is contained in:
Rhys Perry 2021-09-08 18:09:18 +01:00 committed by Marge Bot
parent 30f457e119
commit c1f724b2b9

View file

@ -1810,6 +1810,7 @@ static void
write_if(write_ctx *ctx, nir_if *nif)
{
write_src(ctx, &nif->condition);
blob_write_uint8(ctx->blob, nif->control);
write_cf_list(ctx, &nif->then_list);
write_cf_list(ctx, &nif->else_list);
@ -1821,6 +1822,7 @@ read_if(read_ctx *ctx, struct exec_list *cf_list)
nir_if *nif = nir_if_create(ctx->nir);
read_src(ctx, &nif->condition, nif);
nif->control = blob_read_uint8(ctx->blob);
nir_cf_node_insert_end(cf_list, &nif->cf_node);
@ -1831,6 +1833,7 @@ read_if(read_ctx *ctx, struct exec_list *cf_list)
static void
write_loop(write_ctx *ctx, nir_loop *loop)
{
blob_write_uint8(ctx->blob, loop->control);
write_cf_list(ctx, &loop->body);
}
@ -1841,6 +1844,7 @@ read_loop(read_ctx *ctx, struct exec_list *cf_list)
nir_cf_node_insert_end(cf_list, &loop->cf_node);
loop->control = blob_read_uint8(ctx->blob);
read_cf_list(ctx, &loop->body);
}