fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: Refactor clear color loading functions

Browse source 
Rename the functions and update the parameters in preparation for the
next patch.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31743>
This commit is contained in:
Nanley Chery 2024-10-15 11:57:52 -04:00 • committed by Marge Bot
parent 0d4f2a2db1
commit 43bc4f4576
5 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/intel/vulkan/anv_blorp.c
View file

@ -1678,9 +1678,8 @@ clear_color_attachment(struct anv_cmd_buffer *cmd_buffer,
anv_cmd_buffer_mark_image_fast_cleared(cmd_buffer, iview->image,
iview->planes[0].isl.format,
clear_color);
anv_cmd_buffer_load_clear_color_from_image(cmd_buffer,
att->surface_state.state,
iview->image);
anv_cmd_buffer_load_clear_color(cmd_buffer, att->surface_state.state,
iview);
}
return;
}

8
src/intel/vulkan/anv_cmd_buffer.c
View file

@ -353,12 +353,12 @@ anv_cmd_buffer_mark_image_fast_cleared(struct anv_cmd_buffer *cmd_buffer,
}
void
anv_cmd_buffer_load_clear_color_from_image(struct anv_cmd_buffer *cmd_buffer,
struct anv_state state,
const struct anv_image *image)
anv_cmd_buffer_load_clear_color(struct anv_cmd_buffer *cmd_buffer,
struct anv_state state,
const struct anv_image_view *iview)
{
const struct intel_device_info *devinfo = cmd_buffer->device->info;
anv_genX(devinfo, load_image_clear_color)(cmd_buffer, state, image);
anv_genX(devinfo, cmd_buffer_load_clear_color)(cmd_buffer, state, iview);
}
void

6
src/intel/vulkan/anv_genX.h
View file

@ -78,9 +78,9 @@ genX(set_fast_clear_state)(struct anv_cmd_buffer *cmd_buffer,
union isl_color_value clear_color);
void
genX(load_image_clear_color)(struct anv_cmd_buffer *cmd_buffer,
struct anv_state surface_state,
const struct anv_image *image);
genX(cmd_buffer_load_clear_color)(struct anv_cmd_buffer *cmd_buffer,
struct anv_state surface_state,
const struct anv_image_view *iview);
void genX(cmd_buffer_emit_bt_pool_base_address)(struct anv_cmd_buffer *cmd_buffer);

6
src/intel/vulkan/anv_private.h
View file

@ -5757,9 +5757,9 @@ anv_cmd_buffer_mark_image_fast_cleared(struct anv_cmd_buffer *cmd_buffer,
union isl_color_value clear_color);
void
anv_cmd_buffer_load_clear_color_from_image(struct anv_cmd_buffer *cmd_buffer,
struct anv_state state,
const struct anv_image *image);
anv_cmd_buffer_load_clear_color(struct anv_cmd_buffer *cmd_buffer,
struct anv_state state,
const struct anv_image_view *iview);
enum anv_image_memory_binding
anv_image_aspect_to_binding(struct anv_image *image,

19
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -862,14 +862,11 @@ genX(cmd_buffer_mark_image_written)(struct anv_cmd_buffer *cmd_buffer,
* image's fast clear state buffer.
*/
void
genX(load_image_clear_color)(struct anv_cmd_buffer *cmd_buffer,
struct anv_state surface_state,
const struct anv_image *image)
genX(cmd_buffer_load_clear_color)(struct anv_cmd_buffer *cmd_buffer,
struct anv_state surface_state,
const struct anv_image_view *iview)
{
#if GFX_VER < 10
assert(cmd_buffer && image);
assert(image->vk.aspects & VK_IMAGE_ASPECT_ANY_COLOR_BIT_ANV);
struct anv_address ss_clear_addr =
anv_state_pool_state_address(
&cmd_buffer->device->internal_surface_state_pool,
@ -878,8 +875,9 @@ genX(load_image_clear_color)(struct anv_cmd_buffer *cmd_buffer,
cmd_buffer->device->isl_dev.ss.clear_value_offset
});
const struct anv_address entry_addr =
anv_image_get_clear_color_addr(cmd_buffer->device, image,
anv_image_get_clear_color_addr(cmd_buffer->device, iview->image,
VK_IMAGE_ASPECT_COLOR_BIT);
unsigned copy_size = cmd_buffer->device->isl_dev.ss.clear_value_size;
struct mi_builder b;
@ -901,7 +899,7 @@ genX(load_image_clear_color)(struct anv_cmd_buffer *cmd_buffer,
*/
anv_add_pending_pipe_bits(cmd_buffer,
ANV_PIPE_STATE_CACHE_INVALIDATE_BIT,
"after load_image_clear_color surface state update");
"after load_clear_color surface state update");
#endif
}
@ -5417,9 +5415,8 @@ void genX(CmdBeginRendering)(
iview->image->planes[0].aux_usage != ISL_AUX_USAGE_NONE &&
iview->planes[0].isl.base_level == 0 &&
iview->planes[0].isl.base_array_layer == 0) {
genX(load_image_clear_color)(cmd_buffer,
gfx->color_att[i].surface_state.state,
iview->image);
struct anv_state surf_state = gfx->color_att[i].surface_state.state;
genX(cmd_buffer_load_clear_color)(cmd_buffer, surf_state, iview);
}
if (att->resolveMode != VK_RESOLVE_MODE_NONE) {