radv: remove useless radv_meta_{begin,end}_XXX() helpers
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
parent
e927cb55a9
commit
bd7fd6a0e4
|
@ -153,18 +153,6 @@ void radv_meta_end_blit2d(struct radv_cmd_buffer *cmd_buffer,
|
||||||
|
|
||||||
VkResult radv_device_init_meta_bufimage_state(struct radv_device *device);
|
VkResult radv_device_init_meta_bufimage_state(struct radv_device *device);
|
||||||
void radv_device_finish_meta_bufimage_state(struct radv_device *device);
|
void radv_device_finish_meta_bufimage_state(struct radv_device *device);
|
||||||
void radv_meta_begin_bufimage(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_end_bufimage(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_begin_itoi(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_end_itoi(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_begin_cleari(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_end_cleari(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save);
|
|
||||||
void radv_meta_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
|
void radv_meta_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
|
||||||
struct radv_meta_blit2d_surf *src,
|
struct radv_meta_blit2d_surf *src,
|
||||||
struct radv_meta_blit2d_buffer *dst,
|
struct radv_meta_blit2d_buffer *dst,
|
||||||
|
|
|
@ -814,48 +814,6 @@ fail_itob:
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_begin_itoi(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_save_compute(save, cmd_buffer, 16);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_end_itoi(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_restore_compute(save, cmd_buffer, 16);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_begin_bufimage(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_save_compute(save, cmd_buffer, 12);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_end_bufimage(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_restore_compute(save, cmd_buffer, 12);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_begin_cleari(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_save_compute(save, cmd_buffer, 16);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
radv_meta_end_cleari(struct radv_cmd_buffer *cmd_buffer,
|
|
||||||
struct radv_meta_saved_compute_state *save)
|
|
||||||
{
|
|
||||||
radv_meta_restore_compute(save, cmd_buffer, 16);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
create_iview(struct radv_cmd_buffer *cmd_buffer,
|
create_iview(struct radv_cmd_buffer *cmd_buffer,
|
||||||
struct radv_meta_blit2d_surf *surf,
|
struct radv_meta_blit2d_surf *surf,
|
||||||
|
|
|
@ -1392,7 +1392,7 @@ void radv_CmdClearColorImage(
|
||||||
bool cs = cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE;
|
bool cs = cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE;
|
||||||
|
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_begin_cleari(cmd_buffer, &saved_state.compute);
|
radv_meta_save_compute(&saved_state.compute, cmd_buffer, 16);
|
||||||
else
|
else
|
||||||
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
||||||
|
|
||||||
|
@ -1401,7 +1401,7 @@ void radv_CmdClearColorImage(
|
||||||
rangeCount, pRanges, cs);
|
rangeCount, pRanges, cs);
|
||||||
|
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_end_cleari(cmd_buffer, &saved_state.compute);
|
radv_meta_restore_compute(&saved_state.compute, cmd_buffer, 16);
|
||||||
else
|
else
|
||||||
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ meta_copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
|
||||||
assert(image->info.samples == 1);
|
assert(image->info.samples == 1);
|
||||||
|
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_begin_bufimage(cmd_buffer, &saved_state.compute);
|
radv_meta_save_compute(&saved_state.compute, cmd_buffer, 12);
|
||||||
else
|
else
|
||||||
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@ meta_copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_end_bufimage(cmd_buffer, &saved_state.compute);
|
radv_meta_restore_compute(&saved_state.compute, cmd_buffer, 12);
|
||||||
else
|
else
|
||||||
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
||||||
}
|
}
|
||||||
|
@ -233,7 +233,8 @@ meta_copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
|
||||||
{
|
{
|
||||||
struct radv_meta_saved_compute_state saved_state;
|
struct radv_meta_saved_compute_state saved_state;
|
||||||
|
|
||||||
radv_meta_begin_bufimage(cmd_buffer, &saved_state);
|
radv_meta_save_compute(&saved_state, cmd_buffer, 12);
|
||||||
|
|
||||||
for (unsigned r = 0; r < regionCount; r++) {
|
for (unsigned r = 0; r < regionCount; r++) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -303,7 +304,7 @@ meta_copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer,
|
||||||
slice_array++;
|
slice_array++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
radv_meta_end_bufimage(cmd_buffer, &saved_state);
|
radv_meta_restore_compute(&saved_state, cmd_buffer, 12);
|
||||||
}
|
}
|
||||||
|
|
||||||
void radv_CmdCopyImageToBuffer(
|
void radv_CmdCopyImageToBuffer(
|
||||||
|
@ -339,7 +340,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
|
||||||
*/
|
*/
|
||||||
assert(src_image->info.samples == dest_image->info.samples);
|
assert(src_image->info.samples == dest_image->info.samples);
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_begin_itoi(cmd_buffer, &saved_state.compute);
|
radv_meta_save_compute(&saved_state.compute, cmd_buffer, 16);
|
||||||
else
|
else
|
||||||
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
radv_meta_save_graphics_reset_vport_scissor_novertex(&saved_state.gfx, cmd_buffer);
|
||||||
|
|
||||||
|
@ -413,7 +414,7 @@ meta_copy_image(struct radv_cmd_buffer *cmd_buffer,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cs)
|
if (cs)
|
||||||
radv_meta_end_itoi(cmd_buffer, &saved_state.compute);
|
radv_meta_restore_compute(&saved_state.compute, cmd_buffer, 16);
|
||||||
else
|
else
|
||||||
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
radv_meta_restore(&saved_state.gfx, cmd_buffer);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue