From 6ee4b352c90e93c82d900328716c1068a7188b91 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 28 Sep 2017 19:03:38 -0700 Subject: [PATCH] i965: Use prog->info.num_images for needs_dc computation This should be just as good as looking in prog_data but removes our one state setup dependency on brw_stage_prog_data::nr_image_param. Reviewed-by: Jordan Justen Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/gen7_l3_state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen7_l3_state.c b/src/mesa/drivers/dri/i965/gen7_l3_state.c index a368af36316..0b2d61f9e0f 100644 --- a/src/mesa/drivers/dri/i965/gen7_l3_state.c +++ b/src/mesa/drivers/dri/i965/gen7_l3_state.c @@ -54,8 +54,9 @@ get_pipeline_state_l3_weights(const struct brw_context *brw) const struct brw_stage_prog_data *prog_data = stage_states[i]->prog_data; needs_dc |= (prog && (prog->sh.data->NumAtomicBuffers || - prog->sh.data->NumShaderStorageBlocks)) || - (prog_data && (prog_data->total_scratch || prog_data->nr_image_params)); + prog->sh.data->NumShaderStorageBlocks || + prog->info.num_images)) || + (prog_data && prog_data->total_scratch); needs_slm |= prog_data && prog_data->total_shared; } -- 2.30.2