From c05619328888f006b960f7e39dd70801e539debc Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Fri, 6 Dec 2019 13:00:58 +0200 Subject: [PATCH] anv: drop unused parameter from apply layout pass Signed-off-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_nir.h | 1 - src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 1 - src/intel/vulkan/anv_pipeline.c | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_nir.h b/src/intel/vulkan/anv_nir.h index ad56ea14b60..004f243b7f7 100644 --- a/src/intel/vulkan/anv_nir.h +++ b/src/intel/vulkan/anv_nir.h @@ -54,7 +54,6 @@ void anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice, bool robust_buffer_access, const struct anv_pipeline_layout *layout, nir_shader *shader, - struct brw_stage_prog_data *prog_data, struct anv_pipeline_bind_map *map); void anv_nir_compute_push_layout(const struct anv_physical_device *pdevice, diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index 25cd83faf78..0c0e44f657b 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -1109,7 +1109,6 @@ anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice, bool robust_buffer_access, const struct anv_pipeline_layout *layout, nir_shader *shader, - struct brw_stage_prog_data *prog_data, struct anv_pipeline_bind_map *map) { void *mem_ctx = ralloc_context(NULL); diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index aee3b221937..8c884027cf5 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -688,8 +688,7 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline, /* Apply the actual pipeline layout to UBOs, SSBOs, and textures */ anv_nir_apply_pipeline_layout(pdevice, pipeline->device->robust_buffer_access, - layout, nir, prog_data, - &stage->bind_map); + layout, nir, &stage->bind_map); NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_ubo, nir_address_format_32bit_index_offset); -- 2.30.2