Re: [Mesa-dev] [PATCH 03/14] intel/blorp/blit: Rename blorp_nir_txf_ms_mcs

[Lionel Landwerlin]

I thought I sent a Rb on this one...

Reviewed-by: Lionel Landwerlin 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 03/14] intel/blorp/blit: Rename blorp_nir_txf_ms_mcs

[Jason Ekstrand]

That name is already taken by one of the helpers in blorp_nir_builder.h
and, while we haven't moved the guts of blorp_blit.c there yet, we'd
like to start using some things from that header.
---
 src/intel/blorp/blorp_blit.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c
index 9b5c1f1..19f6c36 100644
--- a/src/intel/blorp/blorp_blit.c
+++ b/src/intel/blorp/blorp_blit.c
@@ -268,7 +268,8 @@ blorp_nir_txf_ms(nir_builder *b, struct brw_blorp_blit_vars 
*v,
 }
 
 static nir_ssa_def *
-blorp_nir_txf_ms_mcs(nir_builder *b, struct brw_blorp_blit_vars *v, 
nir_ssa_def *pos)
+blorp_blit_txf_ms_mcs(nir_builder *b, struct brw_blorp_blit_vars *v,
+  nir_ssa_def *pos)
 {
nir_tex_instr *tex =
   blorp_create_nir_tex_instr(b, v, nir_texop_txf_ms_mcs,
@@ -621,7 +622,7 @@ blorp_nir_manual_blend_average(nir_builder *b, struct 
brw_blorp_blit_vars *v,
 
nir_ssa_def *mcs = NULL;
if (tex_aux_usage == ISL_AUX_USAGE_MCS)
-  mcs = blorp_nir_txf_ms_mcs(b, v, pos);
+  mcs = blorp_blit_txf_ms_mcs(b, v, pos);
 
/* We add together samples using a binary tree structure, e.g. for 4x MSAA:
 *
@@ -783,7 +784,7 @@ blorp_nir_manual_blend_bilinear(nir_builder *b, nir_ssa_def 
*pos,
*/
   nir_ssa_def *mcs = NULL;
   if (key->tex_aux_usage == ISL_AUX_USAGE_MCS)
- mcs = blorp_nir_txf_ms_mcs(b, v, sample_coords_int);
+ mcs = blorp_blit_txf_ms_mcs(b, v, sample_coords_int);
 
   /* Compute sample index and map the sample index to a sample number.
* Sample index layout shows the numbering of slots in a rectangular
@@ -1260,7 +1261,7 @@ brw_blorp_build_nir_shader(struct blorp_context *blorp, 
void *mem_ctx,
  } else {
 nir_ssa_def *mcs = NULL;
 if (key->tex_aux_usage == ISL_AUX_USAGE_MCS)
-   mcs = blorp_nir_txf_ms_mcs(, , src_pos);
+   mcs = blorp_blit_txf_ms_mcs(, , src_pos);
 
 color = blorp_nir_txf_ms(, , src_pos, mcs, 
key->texture_data_type);
  }
-- 
2.5.0.400.gff86faf

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev