fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 18:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir3: Remove ir3_info::data

Browse source 
This isn't useful, and it was getting serialized resulting in garbage in
the blob and tests that check for consistent serialization failing.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33780>
This commit is contained in:
Connor Abbott 2023-10-11 13:04:18 +02:00 • committed by Marge Bot
parent 9baf5aee1a
commit 824cc0e933
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/freedreno/ir3/ir3.c
View file

@ -67,11 +67,10 @@ is_shared_consts(struct ir3_compiler *compiler,
}
static void
collect_reg_info(struct ir3_instruction *instr, struct ir3_register *reg,
collect_reg_info(struct ir3_shader_variant *v,
struct ir3_instruction *instr, struct ir3_register *reg,
struct ir3_info *info)
{
struct ir3_shader_variant *v = info->data;
if (reg->flags & IR3_REG_IMMED) {
/* nothing to do */
return;
@ -248,7 +247,6 @@ ir3_collect_info(struct ir3_shader_variant *v)
const struct ir3_compiler *compiler = v->compiler;
memset(info, 0, sizeof(*info));
info->data = v;
info->max_reg = -1;
info->max_half_reg = -1;
info->max_const = -1;
@ -290,7 +288,7 @@ ir3_collect_info(struct ir3_shader_variant *v)
foreach_src (reg, instr) {
if (!is_reg_gpr(reg) || !regmask_get(&aliases, reg)) {
collect_reg_info(instr, reg, info);
collect_reg_info(v, instr, reg, info);
}
}
@ -299,7 +297,7 @@ ir3_collect_info(struct ir3_shader_variant *v)
instr->cat7.alias_scope == ALIAS_TEX) {
regmask_set(&aliases, instr->dsts[0]);
} else if (is_dest_gpr(reg)) {
collect_reg_info(instr, reg, info);
collect_reg_info(v, instr, reg, info);
}
}

1
src/freedreno/ir3/ir3.h
View file

@ -28,7 +28,6 @@ struct ir3_instruction;
struct ir3_block;
struct ir3_info {
void *data; /* used internally in ir3 assembler */
/* Size in bytes of the shader binary, including NIR constants and
* padding
*/