OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/serialize: restore ray query variables

Browse Source 
The ray query status of a variable is tracked in the
nir_variable::data. We need to store it in the serialization otherwise
restoring NIR from a cache will drop the annotation.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 5a9cdab170 ("nir: track variables representing ray queries")
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16059>
This commit is contained in:
Lionel Landwerlin
2022-04-20 18:28:28 +03:00
committed by Marge Bot
parent 8c31f9a75a
commit a4c5521ea9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/nir/nir_serialize.c
View File

@@ -214,7 +214,7 @@ union packed_var {
unsigned data_encoding:2; unsigned data_encoding:2;
unsigned type_same_as_last:1; unsigned type_same_as_last:1;
unsigned interface_type_same_as_last:1; unsigned interface_type_same_as_last:1;
unsigned _pad:1; unsigned ray_query:1;
unsigned num_members:16; unsigned num_members:16;
} u; } u;
}; };
@@ -285,6 +285,8 @@ write_variable(write_ctx *ctx, const nir_variable *var)
flags.u.data_encoding = var_encode_full; flags.u.data_encoding = var_encode_full;
} }
flags.u.ray_query = var->data.ray_query;
blob_write_uint32(ctx->blob, flags.u32); blob_write_uint32(ctx->blob, flags.u32);
if (!flags.u.type_same_as_last) { if (!flags.u.type_same_as_last) {
@@ -386,6 +388,8 @@ read_variable(read_ctx *ctx)
ctx->last_var_data = var->data; ctx->last_var_data = var->data;
} }
var->data.ray_query = flags.u.ray_query;
var->num_state_slots = flags.u.num_state_slots; var->num_state_slots = flags.u.num_state_slots;
if (var->num_state_slots != 0) { if (var->num_state_slots != 0) {
var->state_slots = ralloc_array(var, nir_state_slot, var->state_slots = ralloc_array(var, nir_state_slot,