From 811990dc1c5ee1c02956041ae6f98a770b2c9f8b Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Wed, 26 Feb 2020 15:54:33 -0800 Subject: [PATCH] anv: Remove unused field xfb_used from anv_pipeline Since we only use xfb_info for GEN >= 8, make the ifdef cover that local variable. Reviewed-by: Lionel Landwerlin Reviewed-by: Jason Ekstrand Tested-by: Marge Bot Part-of: --- src/intel/vulkan/anv_private.h | 2 -- src/intel/vulkan/genX_pipeline.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index b4d1a85ebe3..e30a49a72a0 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -3180,8 +3180,6 @@ struct anv_pipeline { uint32_t instance_divisor; } vb[MAX_VBS]; - uint8_t xfb_used; - bool primitive_restart; uint32_t topology; diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 6e01377c6f4..8fcab77f8ad 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1309,7 +1309,6 @@ emit_3dstate_streamout(struct anv_pipeline *pipeline, const struct brw_vue_prog_data *prog_data = anv_pipeline_get_last_vue_prog_data(pipeline); const struct brw_vue_map *vue_map = &prog_data->vue_map; -#endif nir_xfb_info *xfb_info; if (anv_pipeline_has_stage(pipeline, MESA_SHADER_GEOMETRY)) @@ -1318,8 +1317,7 @@ emit_3dstate_streamout(struct anv_pipeline *pipeline, xfb_info = pipeline->shaders[MESA_SHADER_TESS_EVAL]->xfb_info; else xfb_info = pipeline->shaders[MESA_SHADER_VERTEX]->xfb_info; - - pipeline->xfb_used = xfb_info ? xfb_info->buffers_written : 0; +#endif anv_batch_emit(&pipeline->batch, GENX(3DSTATE_STREAMOUT), so) { so.RenderingDisable = rs_info->rasterizerDiscardEnable; -- 2.30.2