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

Screencopy dmabuf #2133

Merged
merged 5 commits into from
Jun 8, 2020
Merged

Screencopy dmabuf #2133

merged 5 commits into from
Jun 8, 2020

Conversation

any1
Copy link
Contributor

@any1 any1 commented Apr 22, 2020

No description provided.

@any1 any1 changed the title [draft] Screencopy dmabuf [WIP] Screencopy dmabuf Apr 23, 2020
cyanreg
cyanreg reviewed Apr 23, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
@any1 any1 force-pushed the screencopy-dmabuf branch from 83efac4 to c83b83b Compare April 23, 2020 17:17
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
render/wlr_renderer.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Apr 23, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
@any1 any1 force-pushed the screencopy-dmabuf branch 2 times, most recently from d02af1c to 2f0b1b2 Compare April 24, 2020 18:21
@any1 any1 changed the title [WIP] Screencopy dmabuf Screencopy dmabuf Apr 24, 2020
@emersion emersion mentioned this pull request May 8, 2020
Closed
emersion
emersion suggested changes May 11, 2020
View reviewed changes
examples/screencopy-dmabuf.c Outdated Show resolved Hide resolved
examples/screencopy-dmabuf.c Outdated Show resolved Hide resolved
examples/screencopy-dmabuf.c Outdated Show resolved Hide resolved
protocol/wlr-screencopy-unstable-v1.xml Outdated Show resolved Hide resolved
render/gles2/renderer.c Outdated Show resolved Hide resolved
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
examples/screencopy-dmabuf.c Outdated Show resolved Hide resolved
examples/screencopy-dmabuf.c Outdated Show resolved Hide resolved
render/gles2/renderer.c Outdated Show resolved Hide resolved
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
@emersion emersion requested a review from ascent12 May 11, 2020 08:20
@any1 any1 force-pushed the screencopy-dmabuf branch from da4fde2 to c9919c1 Compare May 11, 2020 18:40
@any1
Copy link
Contributor Author

any1 commented May 11, 2020

Rebased and updated based on review.

@any1 any1 mentioned this pull request May 21, 2020
Merged
emersion
emersion reviewed May 25, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
emersion
emersion reviewed May 25, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
emersion
emersion reviewed May 25, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
@any1 any1 force-pushed the screencopy-dmabuf branch from c9919c1 to 4756710 Compare May 25, 2020 19:29
@any1
Copy link
Contributor Author

any1 commented May 25, 2020

Rebased and updated according to review.

@any1 any1 force-pushed the screencopy-dmabuf branch from 4756710 to 9987383 Compare May 31, 2020 16:57
@emersion emersion mentioned this pull request Jun 4, 2020
Closed
emersion
emersion reviewed Jun 5, 2020
View reviewed changes
render/egl.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Jun 5, 2020
View reviewed changes
render/egl.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Jun 5, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
emersion
emersion reviewed Jun 5, 2020
View reviewed changes
types/wlr_screencopy_v1.c Outdated Show resolved Hide resolved
@escalade
Copy link

escalade commented Jun 5, 2020

Fails to compile with #2255:

../render/gles2/renderer.c: In function 'gles2_blit_dmabuf':
../render/gles2/renderer.c:370:22: error: too few arguments to function 'wlr_egl_create_image_from_dmabuf'
  370 |  EGLImageKHR image = wlr_egl_create_image_from_dmabuf(egl, dst_attr);
      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

@emersion
Copy link
Member

emersion commented Jun 5, 2020

Fails to compile with #2255

This one hasn't been merged, so it's expected.

@any1 any1 force-pushed the screencopy-dmabuf branch from 18be2b6 to 0788bab Compare June 5, 2020 19:28
@any1
Copy link
Contributor Author

any1 commented Jun 5, 2020

Updated.

@any1 any1 force-pushed the screencopy-dmabuf branch from 0788bab to 98e55e9 Compare June 5, 2020 21:34
emersion
emersion reviewed Jun 8, 2020
View reviewed changes
render/gles2/renderer.c Outdated Show resolved Hide resolved
emersion
emersion suggested changes Jun 8, 2020
View reviewed changes
Copy link
Member

@emersion emersion left a comment •
edited
Loading

Choose a reason for hiding this comment

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

All right, I think these minor comments are the last ones. OK to merge when fixed.

@emersion
Copy link
Member

emersion commented Jun 8, 2020

Can you also squash this PR into logical commits? ie. squash "examples: screencopy-dmabuf: Use screencopy v3" into "examples: Add screencopy-dmabuf example" and "screencopy: Implement screencopy v3" into "screencopy: Implement copying into dmabuf". Would be nice to have the wlr_renderer_blit_dmabuf addition in a separate commit.

@emersion emersion mentioned this pull request Jun 8, 2020
Closed
@any1 any1 force-pushed the screencopy-dmabuf branch from 98e55e9 to 642ab52 Compare June 8, 2020 18:06
@any1
Copy link
Contributor Author

any1 commented Jun 8, 2020

Fixed the error message, the assert and squashed as requested.

emersion
emersion approved these changes Jun 8, 2020
View reviewed changes
Copy link
Member

@emersion emersion left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for your work!

@emersion emersion merged commit e0d4f75 into swaywm:master Jun 8, 2020
@jtheoof jtheoof mentioned this pull request Jun 11, 2020
Closed
@geekuillaume geekuillaume mentioned this pull request Jun 14, 2020
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cyanreg cyanreg cyanreg left review comments

@danshick danshick danshick left review comments

@progandy progandy progandy left review comments

@emersion emersion emersion approved these changes

@ascent12 ascent12 Awaiting requested review from ascent12

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@any1 @escalade @emersion @progandy @danshick @ascent12 @cyanreg