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.

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

1.9 merge #277

Merged
merged 62 commits into from
Apr 15, 2024
Merged

1.9 merge #277

merged 62 commits into from
Apr 15, 2024

Conversation

fishman
Copy link
Contributor

@fishman fishman commented Feb 26, 2024

render layoer_shell, render, and seatop_move_tiling and fx_renderer are currentlyt he main things that seem to require major changes.

@WillPower3309
Copy link
Owner

Thanks for the work here! We'd like to use the 1.9 release to transition our fx_renderer to use the fx_renderer we've built in scenefx, which will have feature parity with the fx_renderer bundled in swayfx. As part of that, we will simply just have to import fx_renderer from scenefx and it should be plug and play for that portion of the rebase.

@WillPower3309 WillPower3309 marked this pull request as draft March 9, 2024 15:29
@WillPower3309
Copy link
Owner

I'm going to make a few additions to this branch to move along some of the WIP parts, I hope you don't mind :)

@WillPower3309
Copy link
Owner

Should just be render.c that needs fixing now

@WillPower3309
Copy link
Owner

Relies on the swayfx-compat scenefx branch

@WillPower3309
Copy link
Owner

right now it is sort of functional but black screens a lot with

00:00:19.617 [wlr] [render/swapchain.c:98] No free output buffer slot

@WillPower3309
Copy link
Owner

Once the buffer slot issue is fixed, we can start adding back some of the eye candy (lots of TODOs)

@ErikReider
Copy link
Collaborator

Seems like there's a lot of missing code from sway 1.9, like the root.c file not compiling without manually copy/pasting the contents from sway 1.9

@WillPower3309
Copy link
Owner

Event.WINDOW subscribed
Event.MODE subscribed
 err: wayland.c:1470: no compositor00:00:00.486 
[swaynag/swaynag.c:441] failed to register with the wayland display

New fun bug!

@ErikReider
Copy link
Collaborator

ErikReider commented Mar 15, 2024

Not sure if the rebase was applied correctly

@WillPower3309
Copy link
Owner

All that's left now are adding back the compositor effects in render.c (see the many TODOs), and scenefx

@WillPower3309
Copy link
Owner

WillPower3309 commented Apr 9, 2024

Found another issue, when moving a floating window the bottom border can be 1 px off in some positions - likely a rounding issue

EDIT: probably just #113

@WillPower3309
Copy link
Owner

We need to have a discussion on if we should keep scaling in the scene side or make it a compositor responsibility

@WillPower3309 WillPower3309 changed the title [wip] 1.9 merge 1.9 merge Apr 10, 2024
@WillPower3309
Copy link
Owner

Annoying shadow issue when there are no borders (1px wide black "border" between window and shadow, stencil issue?):
2024-04-11_21-04-1712886133

@ErikReider
Copy link
Collaborator

ErikReider commented Apr 13, 2024

Annoying shadow issue when there are no borders (1px wide black "border" between window and shadow, stencil issue?): 2024-04-11_21-04-1712886133

Narrowed it down to the stencil smoothstep function acting up. Very strange since we're using the same logic in master 🥴

Edit: Nvm, seems to be present in master as well, so it's at least not a regression :)

@WillPower3309
Copy link
Owner

Annoying shadow issue when there are no borders (1px wide black "border" between window and shadow, stencil issue?): 2024-04-11_21-04-1712886133

Narrowed it down to the stencil smoothstep function acting up. Very strange since we're using the same logic in master 🥴

Edit: Nvm, seems to be present in master as well, so it's at least not a regression :)

Ugh hopefully it'll be fixed once we switch to a matte

@WillPower3309
Copy link
Owner

With that in mind I think we have feature parity with upstream swayfx now, @ErikReider do you mind giving the render logic another look through? I'll do the same before merging

@WillPower3309 WillPower3309 marked this pull request as ready for review April 14, 2024 00:35
@OriginCode
Copy link

Maybe a little bit off-topic, but will scenefx be tagged soon after or before this PR is merged? It will help a lot for distribution packagers.

@WillPower3309
Copy link
Owner

Maybe a little bit off-topic, but will scenefx be tagged soon after or before this PR is merged? It will help a lot for distribution packagers.

Yup! As soon as the corresponding scene PR is merged I will tag a release

@WillPower3309 WillPower3309 merged commit fb86ed6 into WillPower3309:master Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants