From 814cfa909d24b28ff3f96407ea16eb372a91e9fa Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Tue, 18 Nov 2025 17:24:22 -0800 Subject: [PATCH] blorp: fix argument indentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I'm sorry, but I have OCD and the rest of the file is nicely aligned. Reviewed-by: José Roberto de Souza Reviewed-by: Lionel Landwerlin Signed-off-by: Paulo Zanoni Part-of: --- src/intel/blorp/blorp.c | 10 +++++----- src/intel/blorp/blorp_blit.c | 14 +++++++------- src/intel/blorp/blorp_clear.c | 28 +++++++++++++-------------- src/intel/blorp/blorp_genX_exec_brw.h | 2 +- src/intel/blorp/blorp_priv.h | 8 ++++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/intel/blorp/blorp.c b/src/intel/blorp/blorp.c index 4c43d7cde35..1f3ee2ef567 100644 --- a/src/intel/blorp/blorp.c +++ b/src/intel/blorp/blorp.c @@ -144,10 +144,10 @@ blorp_batch_finish(struct blorp_batch *batch) void blorp_surface_info_init(struct blorp_batch *batch, - struct blorp_surface_info *info, - const struct blorp_surf *surf, - unsigned int level, float layer, - enum isl_format format, bool is_dest) + struct blorp_surface_info *info, + const struct blorp_surf *surf, + unsigned int level, float layer, + enum isl_format format, bool is_dest) { struct blorp_context *blorp = batch->blorp; memset(info, 0, sizeof(*info)); @@ -282,7 +282,7 @@ blorp_hiz_op(struct blorp_batch *batch, struct blorp_surf *surf, const uint32_t layer = start_layer + a; blorp_surface_info_init(batch, ¶ms.depth, surf, level, - layer, surf->surf->format, true); + layer, surf->surf->format, true); /* Align the rectangle primitive to 8x4 pixels. * diff --git a/src/intel/blorp/blorp_blit.c b/src/intel/blorp/blorp_blit.c index c85f511a5aa..badc280fc8f 100644 --- a/src/intel/blorp/blorp_blit.c +++ b/src/intel/blorp/blorp_blit.c @@ -48,7 +48,7 @@ struct blorp_blit_vars { static void blorp_blit_vars_init(nir_builder *b, struct blorp_blit_vars *v, - const struct blorp_blit_prog_key *key) + const struct blorp_blit_prog_key *key) { #define LOAD_INPUT(name, type)\ v->v_##name = BLORP_CREATE_NIR_INPUT(b->shader, name, type); @@ -1179,8 +1179,8 @@ convert_color(struct nir_builder *b, nir_def *color, */ static nir_shader * blorp_build_nir_shader(struct blorp_context *blorp, - struct blorp_batch *batch, void *mem_ctx, - const struct blorp_blit_prog_key *key) + struct blorp_batch *batch, void *mem_ctx, + const struct blorp_blit_prog_key *key) { const struct intel_device_info *devinfo = blorp->isl_dev->info; @@ -2580,9 +2580,9 @@ blorp_blit(struct blorp_batch *batch, } blorp_surface_info_init(batch, ¶ms.src, src_surf, src_level, - src_layer, src_format, false); + src_layer, src_format, false); blorp_surface_info_init(batch, ¶ms.dst, dst_surf, dst_level, - dst_layer, dst_format, true); + dst_layer, dst_format, true); params.src.view.swizzle = src_swizzle; params.dst.view.swizzle = dst_swizzle; @@ -2994,9 +2994,9 @@ blorp_copy(struct blorp_batch *batch, } blorp_surface_info_init(batch, ¶ms.src, src_surf, src_level, - src_layer, ISL_FORMAT_UNSUPPORTED, false); + src_layer, ISL_FORMAT_UNSUPPORTED, false); blorp_surface_info_init(batch, ¶ms.dst, dst_surf, dst_level, - dst_layer, ISL_FORMAT_UNSUPPORTED, true); + dst_layer, ISL_FORMAT_UNSUPPORTED, true); struct blorp_blit_prog_key key = { .base = BLORP_BASE_KEY_INIT(BLORP_SHADER_TYPE_COPY), diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c index 0313c1b717d..4449555bddc 100644 --- a/src/intel/blorp/blorp_clear.c +++ b/src/intel/blorp/blorp_clear.c @@ -494,7 +494,7 @@ fast_clear_surf(struct blorp_batch *batch, return; blorp_surface_info_init(batch, ¶ms.dst, surf, level, - start_layer, format, true); + start_layer, format, true); /* BSpec: 46969 (r45602): * @@ -776,7 +776,7 @@ blorp_clear(struct blorp_batch *batch, assert(num_layers > 0); while (num_layers > 0) { blorp_surface_info_init(batch, ¶ms.dst, surf, level, - start_layer, format, true); + start_layer, format, true); params.dst.view.swizzle = swizzle; params.x0 = x0; @@ -961,7 +961,7 @@ blorp_clear_stencil_as_rgba(struct blorp_batch *batch, uint32_t layer = start_layer + a; blorp_surface_info_init(batch, ¶ms.dst, surf, level, - layer, ISL_FORMAT_UNSUPPORTED, true); + layer, ISL_FORMAT_UNSUPPORTED, true); if (surf->surf->samples > 1) blorp_surf_fake_interleaved_msaa(batch->blorp->isl_dev, ¶ms.dst); @@ -1033,8 +1033,8 @@ blorp_clear_depth_stencil(struct blorp_batch *batch, if (stencil_mask) { blorp_surface_info_init(batch, ¶ms.stencil, stencil, - level, start_layer, - ISL_FORMAT_UNSUPPORTED, true); + level, start_layer, + ISL_FORMAT_UNSUPPORTED, true); params.stencil_mask = stencil_mask; params.stencil_ref = stencil_value; @@ -1055,8 +1055,8 @@ blorp_clear_depth_stencil(struct blorp_batch *batch, if (clear_depth) { blorp_surface_info_init(batch, ¶ms.depth, depth, - level, start_layer, - ISL_FORMAT_UNSUPPORTED, true); + level, start_layer, + ISL_FORMAT_UNSUPPORTED, true); params.z = depth_value; params.depth_format = isl_format_get_depth_format(depth->surf->format, false); @@ -1144,8 +1144,8 @@ blorp_hiz_clear_depth_stencil(struct blorp_batch *batch, const uint32_t layer = start_layer + l; if (clear_stencil) { blorp_surface_info_init(batch, ¶ms.stencil, stencil, - level, layer, - ISL_FORMAT_UNSUPPORTED, true); + level, layer, + ISL_FORMAT_UNSUPPORTED, true); params.stencil_mask = 0xff; params.stencil_ref = stencil_value; params.num_samples = params.stencil.surf.samples; @@ -1156,8 +1156,8 @@ blorp_hiz_clear_depth_stencil(struct blorp_batch *batch, assert(depth && isl_aux_usage_has_hiz(depth->aux_usage)); blorp_surface_info_init(batch, ¶ms.depth, depth, - level, layer, - ISL_FORMAT_UNSUPPORTED, true); + level, layer, + ISL_FORMAT_UNSUPPORTED, true); params.depth.clear_color.f32[0] = depth_value; params.depth_format = isl_format_get_depth_format(depth->surf->format, false); @@ -1301,7 +1301,7 @@ blorp_ccs_resolve(struct blorp_batch *batch, assert(false); } blorp_surface_info_init(batch, ¶ms.dst, surf, - level, start_layer, format, true); + level, start_layer, format, true); /* From the TGL PRM, Volume 2d: 3DSTATE_PS_BODY, * @@ -1502,9 +1502,9 @@ blorp_mcs_partial_resolve(struct blorp_batch *batch, params.y1 = surf->surf->logical_level0_px.height; blorp_surface_info_init(batch, ¶ms.src, surf, 0, - start_layer, format, false); + start_layer, format, false); blorp_surface_info_init(batch, ¶ms.dst, surf, 0, - start_layer, format, true); + start_layer, format, true); params.num_samples = params.dst.surf.samples; params.num_layers = num_layers; diff --git a/src/intel/blorp/blorp_genX_exec_brw.h b/src/intel/blorp/blorp_genX_exec_brw.h index ccdfbfd16a9..a2b438d1d1f 100644 --- a/src/intel/blorp/blorp_genX_exec_brw.h +++ b/src/intel/blorp/blorp_genX_exec_brw.h @@ -1319,7 +1319,7 @@ blorp_emit_null_surface_state(struct blorp_batch *batch, static uint32_t blorp_setup_binding_table(struct blorp_batch *batch, - const struct blorp_params *params) + const struct blorp_params *params) { const struct isl_device *isl_dev = batch->blorp->isl_dev; uint32_t surface_offsets[2], bind_offset = 0; diff --git a/src/intel/blorp/blorp_priv.h b/src/intel/blorp/blorp_priv.h index 8689b81999e..6335b77535b 100644 --- a/src/intel/blorp/blorp_priv.h +++ b/src/intel/blorp/blorp_priv.h @@ -101,10 +101,10 @@ struct blorp_surface_info void blorp_surface_info_init(struct blorp_batch *batch, - struct blorp_surface_info *info, - const struct blorp_surf *surf, - unsigned int level, float layer, - enum isl_format format, bool is_dest); + struct blorp_surface_info *info, + const struct blorp_surf *surf, + unsigned int level, float layer, + enum isl_format format, bool is_dest); void blorp_surf_convert_to_single_slice(const struct isl_device *isl_dev, struct blorp_surface_info *info);