KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv: Remove unused field `urb.total_size` 

This was used before the URB calculation functions were shared by GL
and Vulkan.  Also drop the substruct for the remaining, `l3_config` is
a good name on its own.

Also-written-by: Jason Ekstrand <jason@jlekstrand.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3981>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3981>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2020-02-27 11:02:17 -08:00
parent 0bb25e4713
commit dab7a4d82c
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/anv_pipeline.c
View File

@ -1812,9 +1812,7 @@ anv_pipeline_setup_l3_config(struct anv_pipeline *pipeline, bool needs_slm)
const struct gen_l3_weights w =
gen_get_default_l3_weights(devinfo, true, needs_slm);
pipeline->urb.l3_config = gen_get_l3_config(devinfo, w);
pipeline->urb.total_size =
gen_get_l3_config_urb_size(devinfo, pipeline->urb.l3_config);
pipeline->l3_config = gen_get_l3_config(devinfo, w);
}
VkResult

5
src/intel/vulkan/anv_private.h
View File

@ -3165,10 +3165,7 @@ struct anv_pipeline {
uint32_t num_executables;
struct anv_pipeline_executable executables[MAX_PIPELINE_EXECUTABLES];
struct {
const struct gen_l3_config * l3_config;
uint32_t total_size;
} urb;
const struct gen_l3_config * l3_config;
VkShaderStageFlags active_stages;
struct anv_state blend_state;

4
src/intel/vulkan/genX_cmd_buffer.c
View File

@ -3035,7 +3035,7 @@ genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer)
assert((pipeline->active_stages & VK_SHADER_STAGE_COMPUTE_BIT) == 0);
genX(cmd_buffer_config_l3)(cmd_buffer, pipeline->urb.l3_config);
genX(cmd_buffer_config_l3)(cmd_buffer, pipeline->l3_config);
genX(cmd_buffer_emit_hashing_mode)(cmd_buffer, UINT_MAX, UINT_MAX, 1);
@ -3926,7 +3926,7 @@ genX(cmd_buffer_flush_compute_state)(struct anv_cmd_buffer *cmd_buffer)
assert(pipeline->active_stages == VK_SHADER_STAGE_COMPUTE_BIT);
genX(cmd_buffer_config_l3)(cmd_buffer, pipeline->urb.l3_config);
genX(cmd_buffer_config_l3)(cmd_buffer, pipeline->l3_config);
genX(flush_pipeline_select_gpgpu)(cmd_buffer);

2
src/intel/vulkan/genX_pipeline.c
View File

@ -312,7 +312,7 @@ emit_urb_setup(struct anv_pipeline *pipeline,
}
genX(emit_urb_setup)(pipeline->device, &pipeline->batch,
pipeline->urb.l3_config,
pipeline->l3_config,
pipeline->active_stages, entry_size,
deref_block_size);
}