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

pvr: Rename userpass_spawn to isp_userpass.

Browse source 
Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18707>
This commit is contained in:
Rajnesh Kanwal 2022-08-23 11:35:25 +01:00
parent f19697de5a
commit 2fc20cff4c
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/imagination/vulkan/pvr_cmd_buffer.c
View file

@ -2507,7 +2507,7 @@ static void pvr_emit_clear_words(struct pvr_cmd_buffer *const cmd_buffer,
static VkResult pvr_cs_write_load_op(struct pvr_cmd_buffer *cmd_buffer,
struct pvr_sub_cmd_gfx *sub_cmd,
struct pvr_load_op *load_op,
uint32_t userpass_spawn)
uint32_t isp_userpass)
{
const struct pvr_device *device = cmd_buffer->device;
struct pvr_static_clear_ppp_template template =
@ -2523,7 +2523,7 @@ static VkResult pvr_cs_write_load_op(struct pvr_cmd_buffer *cmd_buffer,
if (result != VK_SUCCESS)
return result;
template.config.ispctl.upass = userpass_spawn;
template.config.ispctl.upass = isp_userpass;
/* It might look odd that we aren't specifying the code segment's
* address anywhere. This is because the hardware always assumes that the
@ -2613,8 +2613,8 @@ void pvr_CmdBeginRenderPass2(VkCommandBuffer commandBuffer,
state->render_pass_info.current_hw_subpass = 0;
state->render_pass_info.pipeline_bind_point =
pass->subpasses[0].pipeline_bind_point;
state->render_pass_info.userpass_spawn = pass->subpasses[0].userpass_spawn;
state->dirty.userpass_spawn = true;
state->render_pass_info.isp_userpass = pass->subpasses[0].isp_userpass;
state->dirty.isp_userpass = true;
result = pvr_cmd_buffer_setup_attachments(cmd_buffer, pass, framebuffer);
if (result != VK_SUCCESS)
@ -2701,8 +2701,8 @@ VkResult pvr_BeginCommandBuffer(VkCommandBuffer commandBuffer,
state->render_pass_info.framebuffer =
pvr_framebuffer_from_handle(inheritance_info->framebuffer);
state->render_pass_info.subpass_idx = inheritance_info->subpass;
state->render_pass_info.userpass_spawn =
pass->subpasses[inheritance_info->subpass].userpass_spawn;
state->render_pass_info.isp_userpass =
pass->subpasses[inheritance_info->subpass].isp_userpass;
result =
pvr_cmd_buffer_start_sub_cmd(cmd_buffer, PVR_SUB_CMD_TYPE_GRAPHICS);
@ -3644,7 +3644,7 @@ pvr_setup_isp_faces_and_control(struct pvr_cmd_buffer *const cmd_buffer,
header->pres_ispctl_fb = true;
pvr_csb_pack (&isp_control, TA_STATE_ISPCTL, ispctl) {
ispctl.upass = pass_info->userpass_spawn;
ispctl.upass = pass_info->isp_userpass;
/* TODO: is bo ever NULL? Figure out what to do. */
ispctl.tagwritedisable = raster_discard_enabled ||
@ -4544,7 +4544,7 @@ pvr_emit_dirty_ppp_state(struct pvr_cmd_buffer *const cmd_buffer,
if (!(dirty_stencil || state->dirty.depth_bias ||
state->dirty.fragment_descriptors || state->dirty.line_width ||
state->dirty.gfx_pipeline_binding || state->dirty.scissor ||
state->dirty.userpass_spawn || state->dirty.viewport ||
state->dirty.isp_userpass || state->dirty.viewport ||
pvr_ppp_state_update_required(state))) {
return VK_SUCCESS;
}
@ -4556,7 +4556,7 @@ pvr_emit_dirty_ppp_state(struct pvr_cmd_buffer *const cmd_buffer,
pvr_setup_isp_faces_and_control(cmd_buffer, &ispa);
pvr_setup_triangle_merging_flag(cmd_buffer, &ispa);
} else if (dirty_stencil || state->dirty.line_width ||
state->dirty.userpass_spawn) {
state->dirty.isp_userpass) {
pvr_setup_isp_faces_and_control(cmd_buffer, NULL);
}
@ -4964,7 +4964,7 @@ static VkResult pvr_validate_draw_state(struct pvr_cmd_buffer *cmd_buffer)
state->dirty.gfx_pipeline_binding = false;
state->dirty.reference = false;
state->dirty.scissor = false;
state->dirty.userpass_spawn = false;
state->dirty.isp_userpass = false;
state->dirty.vertex_bindings = false;
state->dirty.viewport = false;
state->dirty.write_mask = false;
@ -5534,8 +5534,7 @@ static void pvr_insert_transparent_obj(struct pvr_cmd_buffer *const cmd_buffer,
clear.config.pds_state = &pds_state;
clear.config.ispctl.upass =
cmd_buffer->state.render_pass_info.userpass_spawn;
clear.config.ispctl.upass = cmd_buffer->state.render_pass_info.isp_userpass;
/* Emit PPP state from template. */

12
src/imagination/vulkan/pvr_pass.c
View file

@ -121,19 +121,19 @@ static bool pvr_is_subpass_initops_flush_needed(
}
static void
pvr_init_subpass_userpass_spawn(struct pvr_renderpass_hwsetup *hw_setup,
struct pvr_render_pass *pass,
struct pvr_render_subpass *subpasses)
pvr_init_subpass_isp_userpass(struct pvr_renderpass_hwsetup *hw_setup,
struct pvr_render_pass *pass,
struct pvr_render_subpass *subpasses)
{
uint32_t subpass_idx = 0;
for (uint32_t i = 0; i < hw_setup->render_count; i++) {
struct pvr_renderpass_hwsetup_render *hw_render = &hw_setup->renders[i];
uint32_t initial_userpass_spawn =
const uint32_t initial_isp_userpass =
(uint32_t)pvr_is_subpass_initops_flush_needed(pass, hw_render);
for (uint32_t j = 0; j < hw_render->subpass_count; j++) {
subpasses[subpass_idx].userpass_spawn = (j + initial_userpass_spawn);
subpasses[subpass_idx].isp_userpass = (j + initial_isp_userpass);
subpass_idx++;
}
}
@ -503,7 +503,7 @@ VkResult pvr_CreateRenderPass2(VkDevice _device,
if (result != VK_SUCCESS)
goto err_free_pass;
pvr_init_subpass_userpass_spawn(pass->hw_setup, pass, pass->subpasses);
pvr_init_subpass_isp_userpass(pass->hw_setup, pass, pass->subpasses);
for (uint32_t i = 0; i < pass->hw_setup->render_count; i++) {
struct pvr_renderpass_hwsetup_render *hw_render =

6
src/imagination/vulkan/pvr_private.h
View file

@ -795,7 +795,7 @@ struct pvr_render_pass_info {
bool process_empty_tiles;
bool enable_bg_tag;
uint32_t userpass_spawn;
uint32_t isp_userpass;
/* Have we had to scissor a depth/stencil clear because render area was not
* tile aligned?
@ -1012,7 +1012,7 @@ struct pvr_cmd_buffer_state {
bool write_mask : 1;
bool reference : 1;
bool userpass_spawn : 1;
bool isp_userpass : 1;
/* Some draw state needs to be tracked for changes between draw calls
* i.e. if we get a draw with baseInstance=0, followed by a call with
@ -1383,7 +1383,7 @@ struct pvr_render_subpass {
uint32_t index;
uint32_t userpass_spawn;
uint32_t isp_userpass;
VkPipelineBindPoint pipeline_bind_point;
};