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

zink: stop allocating xfb slot map

Browse source 
this can just be inlined since it's a small static size

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9271>
This commit is contained in:
Mike Blumenkrantz 2021-02-24 14:57:03 -05:00 • committed by Marge Bot
parent 086262fc53
commit 7cef91dd43
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/zink/zink_compiler.c
View file

@ -422,6 +422,7 @@ update_so_info(struct zink_shader *sh,
/* Map Gallium's condensed "slots" back to real VARYING_SLOT_* enums */
sh->streamout.so_info_slots[i] = reverse_map[output->register_index];
}
sh->streamout.have_xfb = true;
}
VkShaderModule
@ -434,7 +435,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
/* TODO: use a separate mem ctx here for ralloc */
if (zs->nir->info.stage < MESA_SHADER_FRAGMENT) {
if (zink_vs_key(key)->last_vertex_stage) {
if (zs->streamout.so_info_slots)
if (zs->streamout.have_xfb)
streamout = &zs->streamout;
if (!zink_vs_key(key)->clip_halfz) {
@ -664,8 +665,6 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
ret->nir = nir;
if (so_info) {
memcpy(&ret->streamout.so_info, so_info, sizeof(struct pipe_stream_output_info));
ret->streamout.so_info_slots = malloc(so_info->num_outputs * sizeof(unsigned int));
assert(ret->streamout.so_info_slots);
update_so_info(ret, nir->info.outputs_written, have_psiz);
}
@ -693,7 +692,6 @@ zink_shader_free(struct zink_context *ctx, struct zink_shader *shader)
}
}
_mesa_set_destroy(shader->programs, NULL);
free(shader->streamout.so_info_slots);
ralloc_free(shader->nir);
FREE(shader);
}

3
src/gallium/drivers/zink/zink_compiler.h
View file

@ -50,7 +50,8 @@ struct set;
struct tgsi_token;
struct zink_so_info {
struct pipe_stream_output_info so_info;
unsigned *so_info_slots;
unsigned so_info_slots[PIPE_MAX_SO_OUTPUTS];
bool have_xfb;
};