Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

Renderer v6, incremental version #2240

Merged
merged 14 commits into from
Nov 15, 2020
Merged

Renderer v6, incremental version #2240

merged 14 commits into from
Nov 15, 2020

Conversation

emersion
Copy link
Member

@emersion emersion commented Jun 1, 2020 •
edited
Loading

This is an alternative to #1355. Instead of re-working the whole API, this PR just uses the new infrastructure inside the DRM backend.

The DRM backend used EGLSurface and gbm_surface until now. Stop using them and switch to wlr_allocator and wlr_swapchain. These new interfaces are mostly copied over from glider.

This PR doesn't break the wlroots API. For now the new APIs are not exposed in public header, once we add APIs that allow compositors to use it directly, we can easily move the headers to the public dir.

TODO:

References: #1352

Breaking changes: some implicit assumptions about wlr_renderer's EGL context no longer hold true. Compositors not using EGL directly shouldn't be affected.

  • wlroots' framebuffer no longer is the EGL default framebuffer
  • wlroots' framebuffer no longer has a depth attachment

any1
any1 reviewed Jun 9, 2020
View reviewed changes
render/gbm_allocator.c Show resolved Hide resolved
render/gbm_allocator.c Show resolved Hide resolved
@emersion emersion force-pushed the swapchain branch 8 times, most recently from 6229ac5 to a548b07 Compare June 9, 2020 15:31
any1
any1 reviewed Jun 9, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
@emersion
Copy link
Member Author

emersion commented Jun 9, 2020

So, good news is that the current code works. Bad news is that everything is flipped + rotated by 180 degrees for some reason.

@any1
Copy link
Contributor

any1 commented Jun 9, 2020

So, good news is that the current code works. Bad news is that everything is flipped + rotated by 180 degrees for some reason.

Oh, yeah, I ran into that issue with #2268 too. Mesa bug or feature?

@emersion emersion mentioned this pull request Jun 11, 2020
Closed
@emersion
Copy link
Member Author

OpenGL seems to expect (0, 0) to be the bottom-left corner when using EGLSurface, and the top-left corner when using FBOs. See my temporary "hack: fix y-inverted output" commit.

@emersion emersion force-pushed the swapchain branch 2 times, most recently from c723151 to 51fb54d Compare June 30, 2020 14:32
@emersion emersion mentioned this pull request Jul 1, 2020
Merged
@emersion emersion force-pushed the swapchain branch 3 times, most recently from 5a5f384 to d0cbe18 Compare July 7, 2020 18:06
@emersion emersion force-pushed the swapchain branch 8 times, most recently from fa22f19 to 78bd87a Compare July 27, 2020 16:40
@ammen99
Copy link
Member

ammen99 commented Aug 25, 2020

@emersion Thanks for looking into it. I think it may have indeed been a driver bug. Since last time I reproduced, I have updated kernel + mesa-git, and now I can't reproduce anymore. I'll start using this as a daily driver to test it out more :)

@ollieparanoid ollieparanoid mentioned this pull request Sep 27, 2020
Closed
@emersion emersion force-pushed the swapchain branch 2 times, most recently from cf35391 to 03d51a0 Compare October 22, 2020 13:34
@emersion
Copy link
Member Author

Fixed the screencopy issue when capturing a region of the screen. This PR doesn't have more known issues.

@ddevault Should we wait on the iris bugfix before merging this?

@ddevault
Copy link
Contributor

Should probably block the release but not necessarily the merge

@emersion
Copy link
Member Author

Agree. Then this is ready for another review round.

@emersion
Copy link
Member Author

emersion commented Nov 4, 2020

The iris bug has been fixed: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7384

@emersion
render: introduce wlr_allocator
fbe407e
@emersion
render: introduce wlr_gbm_allocator
72fc534
@emersion
render/drm_format_set: introduce wlr_drm_format_dup
59efa54
@emersion
render: introduce wlr_swapchain
ce3ef60 
The swapchain maximum capacity is set to 4, so that we have enough room
for:

- A buffer currently displayed on screen
- A buffer queued for display (e.g. to KMS)
- A pending buffer that'll be queued next commit
- An additional pending buffer in case we want to invalidate the
  currently pending one
@emersion
buffer: add wlr_client_buffer_get
4c92da4
@emersion
render: introduce wlr_renderer_bind_buffer
0f7be07
@emersion
render/gles2: implement wlr_renderer_bind_buffer
af45341
@emersion
render/gles2: fix y-inverted output when rendering to buffer
4268164
@emersion
backend/drm: use wlr_swapchain
5469683
@emersion
render/swapchain: add support for buffer age
5f8bfdf
@emersion
backend/drm: add support for wlr_swapchain buffer age
5030f68
@emersion
backend/drm: get rid of wlr_drm_fb_type
59bc42f 
Since all DRM FBs are backed by a wlr_buffer, there's no need for this
anymore.
@emersion
backend/drm: add support for wlr_swapchain multi-GPU
213970e
@emersion
backend/drm: check drm_surface_render_black_frame return value
2aac3c2 
This avoids hitting an assertion in drm_fb_lock_surface when
we failed to render a black frame.
@emersion
Copy link
Member Author

emersion commented Nov 15, 2020 •
edited
Loading

All right, let's merge this. Thanks everyone for the feedback and testing!

@emersion emersion merged commit eef8b3d into swaywm:master Nov 15, 2020
@emersion emersion deleted the swapchain branch November 15, 2020 21:48
@ammen99 ammen99 mentioned this pull request Nov 16, 2020
Merged
@ddevault
Copy link
Contributor

Great work!

@emersion emersion mentioned this pull request Mar 12, 2021
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ddevault ddevault ddevault left review comments

@any1 any1 any1 left review comments

@ascent12 ascent12 Awaiting requested review from ascent12

Assignees
No one assigned
Labels
breaking Breaking change in public API
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@emersion @any1 @mortie @ammen99 @ifreund @ddevault @adee