diff options
| -rw-r--r-- | src/intel/vulkan/anv_pipeline.c | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 5 | ||||
| -rw-r--r-- | src/intel/vulkan/genX_cmd_buffer.c | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/genX_pipeline.c | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index ca073dd2370..61dc3e8ba3b 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -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 diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index e30a49a72a0..0072bd8422d 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -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; diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 51b14f2cb9d..74a052d4807 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -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); diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 8fcab77f8ad..c9f8eaa6f51 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -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); } |