[Mesa-dev] [PATCH 20/32] i965/blorp/gen6-7: Move surfaces and samplers closer together

[Pohjolainen, Topi]

On Thu, Aug 11, 2016 at 02:15:17PM -0700, Jason Ekstrand wrote:
> This mimics what we do on gen8.
> ---
>  src/mesa/drivers/dri/i965/gen6_blorp.c |  4 ++--
>  src/mesa/drivers/dri/i965/gen7_blorp.c | 17 ++++++++---------
>  2 files changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.c b/src/mesa/drivers/dri/i965/gen6_blorp.c
> index 3fa8090..b252d78 100644
> --- a/src/mesa/drivers/dri/i965/gen6_blorp.c
> +++ b/src/mesa/drivers/dri/i965/gen6_blorp.c
> @@ -550,6 +550,7 @@ gen6_blorp_exec(struct brw_context *brw,
>           gen6_blorp_emit_binding_table(brw,
>                                         wm_surf_offset_renderbuffer,
>                                         wm_surf_offset_texture);
> +      gen6_blorp_emit_binding_table_pointers(brw, wm_bind_bo_offset);
>     }
>  
>     if (params->src.bo) {
> @@ -557,13 +558,12 @@ gen6_blorp_exec(struct brw_context *brw,
>           gen6_blorp_emit_sampler_state(brw, BRW_MAPFILTER_LINEAR, 0, true);
>        gen6_blorp_emit_sampler_state_pointers(brw, sampler_offset);
>     }
> +

This is probably rebase leftover but actually increases readability. Patches
16-23 are:

Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

>     gen6_blorp_emit_vs_disable(brw, params);
>     gen6_blorp_emit_gs_disable(brw, params);
>     gen6_blorp_emit_clip_disable(brw);
>     gen6_blorp_emit_sf_config(brw, params);
>     gen6_blorp_emit_wm_config(brw, params);
> -   if (params->wm_prog_data)
> -      gen6_blorp_emit_binding_table_pointers(brw, wm_bind_bo_offset);
>     gen6_blorp_emit_viewport_state(brw, params);
>  
>     if (params->depth.bo)
> diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.c b/src/mesa/drivers/dri/i965/gen7_blorp.c
> index 122f37f..adbf909 100644
> --- a/src/mesa/drivers/dri/i965/gen7_blorp.c
> +++ b/src/mesa/drivers/dri/i965/gen7_blorp.c
> @@ -511,7 +511,15 @@ gen7_blorp_exec(struct brw_context *brw,
>           gen6_blorp_emit_binding_table(brw,
>                                         wm_surf_offset_renderbuffer,
>                                         wm_surf_offset_texture);
> +      gen7_blorp_emit_binding_table_pointers_ps(brw, wm_bind_bo_offset);
>     }
> +
> +   if (params->src.bo) {
> +      const uint32_t sampler_offset =
> +         gen6_blorp_emit_sampler_state(brw, BRW_MAPFILTER_LINEAR, 0, true);
> +      gen7_blorp_emit_sampler_state_pointers_ps(brw, sampler_offset);
> +   }
> +
>     gen7_blorp_emit_vs_disable(brw);
>     gen7_blorp_emit_hs_disable(brw);
>     gen7_blorp_emit_te_disable(brw);
> @@ -521,15 +529,6 @@ gen7_blorp_exec(struct brw_context *brw,
>     gen6_blorp_emit_clip_disable(brw);
>     gen7_blorp_emit_sf_config(brw, params);
>     gen7_blorp_emit_wm_config(brw, params);
> -   if (params->wm_prog_data)
> -      gen7_blorp_emit_binding_table_pointers_ps(brw, wm_bind_bo_offset);
> -
> -   if (params->src.bo) {
> -      const uint32_t sampler_offset =
> -         gen6_blorp_emit_sampler_state(brw, BRW_MAPFILTER_LINEAR, 0, true);
> -      gen7_blorp_emit_sampler_state_pointers_ps(brw, sampler_offset);
> -   }
> -
>     gen7_blorp_emit_ps_config(brw, params);
>     gen7_blorp_emit_cc_viewport(brw);
>  
> -- 
> 2.5.0.400.gff86faf
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev