From 283d5bff4eb2a22c9f01f7e6db5cc9ddf4fa9d45 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 26 Oct 2021 16:51:41 -0700 Subject: [PATCH] intel: Rename intel_compute_pixel_hash_table() to intel_compute_pixel_hash_table_3way(). For consistency with intel_compute_pixel_hash_table_nway(). Reviewed-by: Caio Oliveira Part-of: --- src/gallium/drivers/iris/iris_state.c | 12 ++++++------ src/intel/common/intel_pixel_hash.h | 6 +++--- src/intel/vulkan/genX_state.c | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index c8b4aaeb7f2..5891ef6bdad 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -821,7 +821,7 @@ upload_pixel_hashing_tables(struct iris_batch *batch) const bool flip = devinfo->ppipe_subslices[0] < devinfo->ppipe_subslices[1]; struct GENX(SLICE_HASH_TABLE) table; - intel_compute_pixel_hash_table(16, 16, 3, 3, flip, table.Entry[0]); + intel_compute_pixel_hash_table_3way(16, 16, 3, 3, flip, table.Entry[0]); GENX(SLICE_HASH_TABLE_pack)(NULL, map, &table); @@ -860,16 +860,16 @@ upload_pixel_hashing_tables(struct iris_batch *batch) p.SliceHashControl[0] = TABLE_0; if (ppipes_of[2] == 2 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 2, 2, 0, p.TwoWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 2, 2, 0, p.TwoWayTableEntry[0]); else if (ppipes_of[2] == 1 && ppipes_of[1] == 1 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 3, 3, 0, p.TwoWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 3, 3, 0, p.TwoWayTableEntry[0]); if (ppipes_of[2] == 2 && ppipes_of[1] == 1) - intel_compute_pixel_hash_table(8, 16, 5, 4, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 5, 4, 0, p.ThreeWayTableEntry[0]); else if (ppipes_of[2] == 2 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 2, 2, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 2, 2, 0, p.ThreeWayTableEntry[0]); else if (ppipes_of[2] == 1 && ppipes_of[1] == 1 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 3, 3, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 3, 3, 0, p.ThreeWayTableEntry[0]); else unreachable("Illegal fusing."); } diff --git a/src/intel/common/intel_pixel_hash.h b/src/intel/common/intel_pixel_hash.h index 306880879a6..5fbd90145b0 100644 --- a/src/intel/common/intel_pixel_hash.h +++ b/src/intel/common/intel_pixel_hash.h @@ -50,9 +50,9 @@ * pipe indices from the highest to lowest EU count. */ UNUSED static void -intel_compute_pixel_hash_table(unsigned n, unsigned m, - unsigned period, unsigned index, bool flip, - uint32_t *p) +intel_compute_pixel_hash_table_3way(unsigned n, unsigned m, + unsigned period, unsigned index, bool flip, + uint32_t *p) { for (unsigned i = 0; i < n; i++) { for (unsigned j = 0; j < m; j++) { diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c index 3faf61bc017..8d7e08a8095 100644 --- a/src/intel/vulkan/genX_state.c +++ b/src/intel/vulkan/genX_state.c @@ -57,7 +57,7 @@ genX(emit_slice_hashing_state)(struct anv_device *device, const bool flip = device->info.ppipe_subslices[0] < device->info.ppipe_subslices[1]; struct GENX(SLICE_HASH_TABLE) table; - intel_compute_pixel_hash_table(16, 16, 3, 3, flip, table.Entry[0]); + intel_compute_pixel_hash_table_3way(16, 16, 3, 3, flip, table.Entry[0]); GENX(SLICE_HASH_TABLE_pack)(NULL, device->slice_hash.map, &table); } @@ -96,16 +96,16 @@ genX(emit_slice_hashing_state)(struct anv_device *device, p.SliceHashControl[0] = TABLE_0; if (ppipes_of[2] == 2 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 2, 2, 0, p.TwoWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 2, 2, 0, p.TwoWayTableEntry[0]); else if (ppipes_of[2] == 1 && ppipes_of[1] == 1 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 3, 3, 0, p.TwoWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 3, 3, 0, p.TwoWayTableEntry[0]); if (ppipes_of[2] == 2 && ppipes_of[1] == 1) - intel_compute_pixel_hash_table(8, 16, 5, 4, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 5, 4, 0, p.ThreeWayTableEntry[0]); else if (ppipes_of[2] == 2 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 2, 2, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 2, 2, 0, p.ThreeWayTableEntry[0]); else if (ppipes_of[2] == 1 && ppipes_of[1] == 1 && ppipes_of[0] == 1) - intel_compute_pixel_hash_table(8, 16, 3, 3, 0, p.ThreeWayTableEntry[0]); + intel_compute_pixel_hash_table_3way(8, 16, 3, 3, 0, p.ThreeWayTableEntry[0]); else unreachable("Illegal fusing."); }