Skip to content
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

Jump to bottom

Fix transformation for Layout::TopRowFirst #3188

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Fix transformation for Layout::TopRowFirst #3188

merged 1 commit into from
Jan 16, 2024

Conversation

AlanGriffiths
Copy link
Collaborator

@AlanGriffiths AlanGriffiths commented Jan 15, 2024 •
edited
Loading

Fixes: #3185

@codecov Codecov
Copy link

codecov bot commented Jan 15, 2024 •
edited
Loading

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (a632621) 77.85% compared to head (53df45c) 77.86%.

Files Patch % Lines
src/renderers/gl/renderer.cpp 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@           Coverage Diff            @@
##             main    #3188    +/-   ##
========================================
  Coverage   77.85%   77.86%            
========================================
  Files        1070     1080    +10     
  Lines       74893    75341   +448     
========================================
+ Hits        58311    58662   +351     
- Misses      16582    16679    +97

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@AlanGriffiths AlanGriffiths changed the title Please ignore Fix transformation for Layout::TopRowFirst Jan 16, 2024
@AlanGriffiths AlanGriffiths marked this pull request as ready for review January 16, 2024 09:44
@AlanGriffiths AlanGriffiths requested a review from RAOF January 16, 2024 09:44
@AlanGriffiths
Copy link
Collaborator Author

AlanGriffiths commented Jan 16, 2024 •
edited
Loading

The error on rawhide looks unrelated:

2024-01-16T09:51:36.9234571Z [ 44%] Generating logind-session.h
2024-01-16T09:51:36.9235597Z cd /spread/mir/spread/build/build/src/server/console && gdbus-codegen --header --output logind-session.h --interface-prefix org.freedesktop.login1 --c-namespace Logind /spread/mir/src/server/console/logind-session.xml
2024-01-16T09:51:36.9235710Z Traceback (most recent call last):
2024-01-16T09:51:36.9235909Z   File "/usr/bin/gdbus-codegen", line 53, in <module>
2024-01-16T09:51:36.9236025Z     from codegen import codegen_main
2024-01-16T09:51:36.9236363Z   File "/usr/share/glib-2.0/codegen/codegen_main.py", line 29, in <module>
2024-01-16T09:51:36.9236465Z     from . import dbustypes
2024-01-16T09:51:36.9236746Z   File "/usr/share/glib-2.0/codegen/dbustypes.py", line 22, in <module>
2024-01-16T09:51:36.9236847Z     from . import utils
2024-01-16T09:51:36.9237108Z   File "/usr/share/glib-2.0/codegen/utils.py", line 22, in <module>
2024-01-16T09:51:36.9237211Z     import packaging.version
2024-01-16T09:51:36.9237414Z ModuleNotFoundError: No module named 'packaging'

Also, the (surprisingly similar) Frame snapping error:

2024-01-16T10:19:08.5671479Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.736 Starting Snapcraft 8.0.1
2024-01-16T10:19:08.5674271Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.738 lifecycle command: 'pack', arguments: Namespace(destructive_mode=False, use_lxd=False, debug=False, enable_manifest=True, manifest_image_information=None, bind_ssh=False, build_for='amd64', http_proxy=None, https_proxy=None, ua_token=None, enable_experimental_ua_services=False, enable_experimental_plugins=False, enable_experimental_extensions=False, enable_developer_debug=False, enable_experimental_target_arch=False, target_arch=None, provider=None, directory=None, output=None)
2024-01-16T10:19:08.5678608Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.738 command: pack, arguments: Namespace(destructive_mode=False, use_lxd=False, debug=False, enable_manifest=True, manifest_image_information=None, bind_ssh=False, build_for='amd64', http_proxy=None, https_proxy=None, ua_token=None, enable_experimental_ua_services=False, enable_experimental_plugins=False, enable_experimental_extensions=False, enable_developer_debug=False, enable_experimental_target_arch=False, target_arch=None, provider=None, directory=None, output=None)
2024-01-16T10:19:08.5681499Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 Skipping build-on: arm64 build-for: ['arm64'] because build-on doesn't match host arch: amd64
2024-01-16T10:19:08.5682761Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 Skipping build-on: armhf build-for: ['armhf'] because build-on doesn't match host arch: amd64
2024-01-16T10:19:08.5684026Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 Skipping build-on: riscv64 build-for: ['riscv64'] because build-on doesn't match host arch: amd64
2024-01-16T10:19:08.5685028Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 CPU count (from process affinity): 4
2024-01-16T10:19:08.5685856Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 Invalid SNAPCRAFT_MAX_PARALLEL_BUILD_COUNT ''
2024-01-16T10:19:08.5686630Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.760 Running on amd64 for amd64
2024-01-16T10:19:08.5687669Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.762 CRAFT_ARCH_TRIPLET is deprecated, use CRAFT_ARCH_TRIPLET_BUILD_{ON|FOR}
2024-01-16T10:19:08.5688566Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.764 Initializing parts lifecycle
2024-01-16T10:19:08.5689356Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.765 is_snap: True, SNAP_NAME set to snapcraft
2024-01-16T10:19:08.5690269Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.766 A part named 'platform' is not defined in the parts list.
2024-01-16T10:19:08.5691137Z 2024-01-16 10:19:04.108 :: Review the parts definition and make sure it's correct.
2024-01-16T10:19:08.5692205Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.767 Traceback (most recent call last):
2024-01-16T10:19:08.5693356Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.767   File "/snap/snapcraft/10279/lib/python3.10/site-packages/snapcraft/parts/parts.py", line 95, in __init__
2024-01-16T10:19:08.5694479Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.767     self._lcm = craft_parts.LifecycleManager(
2024-01-16T10:19:08.5695686Z 2024-01-16 10:19:04.108 :: 2024-01-16 10:19:03.767   File "/snap/snapcraft/10279/lib/python3.10/site-packages/craft_parts/lifecycle_manager.py", line 152, in __init__
2024-01-16T10:19:08.5696856Z 2024-01-16 10:19:04.109 :: 2024-01-16 10:19:03.767     _validate_part_dependencies(part, parts_data)
2024-01-16T10:19:08.5698154Z 2024-01-16 10:19:04.109 :: 2024-01-16 10:19:03.767   File "/snap/snapcraft/10279/lib/python3.10/site-packages/craft_parts/lifecycle_manager.py", line 355, in _validate_part_dependencies
2024-01-16T10:19:08.5699347Z 2024-01-16 10:19:04.109 :: 2024-01-16 10:19:03.767     raise errors.InvalidPartName(name)
2024-01-16T10:19:08.5700422Z 2024-01-16 10:19:04.109 :: 2024-01-16 10:19:03.767 craft_parts.errors.InvalidPartName: A part named 'platform' is not defined in the parts list.
2024-01-16T10:19:08.5701528Z 2024-01-16 10:19:04.109 :: 2024-01-16 10:19:03.767 Review the parts definition and make sure it's correct.

@AlanGriffiths
Copy link
Collaborator Author

By way of explanation, the matrix multiplication is creating a function that combines inverting with the supplied transform. And we should be applying invert(transform(image)), not transform(invert(image))

@RAOF
Copy link
Contributor

RAOF commented Jan 16, 2024

Commutivity! 😠

By way of explanation, the matrix multiplication is creating a function that combines inverting with the supplied transform. And we should be applying invert(transform(image)), not transform(invert(image))

Correct. And we apply the transformations by left-multiplication, so our final layout transform needs to be leftmost. Argh.

RAOF
RAOF approved these changes Jan 16, 2024
View reviewed changes
Copy link
Contributor

@RAOF RAOF left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Argh!

@RAOF RAOF added this pull request to the merge queue Jan 16, 2024
Merged via the queue into main with commit ed98ba6 Jan 16, 2024
34 of 60 checks passed
@RAOF RAOF deleted the laterality branch January 16, 2024 22:16
AlanGriffiths pushed a commit that referenced this pull request Jan 17, 2024
@RAOF @AlanGriffiths
Merge pull request #3188 from MirServer/laterality
545ea04 
Fix transformation for Layout::TopRowFirst
AlanGriffiths added a commit that referenced this pull request Jan 19, 2024
@AlanGriffiths @RAOF
Release 2.16.2 (#3189)
435dffd 
* Merge pull request #3188 from MirServer/laterality

Fix transformation for Layout::TopRowFirst

* Patch release 2.16.2 changelog

---------

Co-authored-by: Christopher James Halse Rogers <chris@cooperteam.net>
AlanGriffiths added a commit that referenced this pull request Jan 22, 2024
@Saviq @RAOF @AlanGriffiths
cmake, tag: fix versions (#3195)
a282687 
* Merge pull request #3188 from MirServer/laterality

Fix transformation for Layout::TopRowFirst

* Patch release 2.16.2 changelog

---------

Co-authored-by: Christopher James Halse Rogers <chris@cooperteam.net>
Co-authored-by: Alan Griffiths <alan@octopull.co.uk>
@AlanGriffiths AlanGriffiths mentioned this pull request Feb 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RAOF RAOF RAOF approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Display with orientation: left/right flipped
2 participants
@AlanGriffiths @RAOF