diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-11-11 15:42:51 -0800 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2017-11-27 16:19:38 -0800 |
| commit | dc21c3937c603eeb097327c080b9b70f224ce23b (patch) | |
| tree | 63a86a346868d0710c660191cd84926f9b4cd577 | |
| parent | 46148be8e45db0587622535dab4e1064c3503705 (diff) | |
intel/blorp/blit: Rename blorp_nir_txf_ms_mcs
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.
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
| -rw-r--r-- | src/intel/blorp/blorp_blit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index 9b5c1f1f8c1..19f6c363f1e 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(&b, &v, src_pos); + mcs = blorp_blit_txf_ms_mcs(&b, &v, src_pos); color = blorp_nir_txf_ms(&b, &v, src_pos, mcs, key->texture_data_type); } |