Skip to content

backend: Allow offsets to be specified as pixels or bytes #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidplowman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

backend: Allow offsets to be specified as pixels or bytes #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/libpisp/backend/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ void BackEnd::SetOutputFormat(unsigned int i, pisp_be_output_format_config const
PISP_ASSERT(i < variant_.BackEndNumBranches(0));
be_config_.output_format[i] = output_format;
be_config_.output_format[i].pad[0] = be_config_.output_format[i].pad[1] = be_config_.output_format[i].pad[2] = 0;
be_config_extra_.output_format[i] = { 0, 0 };
be_config_extra_.output_format[i] = { 0, 0, { 0, 0 } };
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_OUTPUT(i);
// Should only need a retile if the transform has changed, othwise a finalise_tile will do.
retile_ = true;
Expand All @@ -423,6 +423,13 @@ void BackEnd::SetOutputFormat(unsigned int i, pisp_be_output_format_config const
be_config_extra_.output_format[i] = output_extra;
}

void BackEnd::SetOutputFormatExtra(unsigned int i, pisp_be_output_format_extra const &output_extra)
{
be_config_extra_.output_format[i] = output_extra;
be_config_extra_.dirty_flags_rgb |= PISP_BE_RGB_ENABLE_OUTPUT(i);
finalise_tiling_ = true;
}

void BackEnd::GetOutputFormat(unsigned int i, pisp_be_output_format_config &output_format) const
{
PISP_ASSERT(i < variant_.BackEndNumBranches(0));
Expand Down
1 change: 1 addition & 0 deletions src/libpisp/backend/backend.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ class BackEnd final
void SetOutputFormat(unsigned int i, pisp_be_output_format_config const &output_format);
void SetOutputFormat(unsigned int i, pisp_be_output_format_config const &output_format,
pisp_be_output_format_extra const &output_extra);
void SetOutputFormatExtra(unsigned int i, pisp_be_output_format_extra const &output_extra);
void GetOutputFormat(unsigned int i, pisp_be_output_format_config &output_format) const;
void GetOutputFormat(unsigned int i, pisp_be_output_format_config &output_format,
pisp_be_output_format_extra &output_extra) const;
Expand Down
2 changes: 2 additions & 0 deletions src/libpisp/backend/backend_prepare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,8 @@ void BackEnd::finaliseTiling()
t.output_offset_x[j] + be_config_extra_.output_format[j].offset_x,
t.output_offset_y[j] + be_config_extra_.output_format[j].offset_y,
&t.output_addr_offset[j], &t.output_addr_offset2[j]);
t.output_addr_offset[j] += be_config_extra_.output_format[j].offset_bytes[0];
t.output_addr_offset2[j] += be_config_extra_.output_format[j].offset_bytes[1];

PISP_LOG(debug, "Branch " << j << " output offsets " << t.output_offset_x[j] << "," << t.output_offset_y[j]
<< " address offsets " << t.output_addr_offset[j] << " and "
Expand Down
5 changes: 5 additions & 0 deletions src/libpisp/backend/pisp_be_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,10 +739,15 @@ struct pisp_be_output_format_config
*
* @offset_x: Horizontal offset of the output window
* @offset_y: Vertical offset of the output window
* @offset_bytes: Offset of the output window in bytes for up to two output planes
*
* Applications will normally pass either offset_x/y or offset_bytes, leaving the
* ones they aren't using at zero.
*/
struct pisp_be_output_format_extra {
__u16 offset_x;
__u16 offset_y;
__u32 offset_bytes[2];
} __attribute__((packed));

/**
Expand Down
Loading