Skip to content

[GTK] fix USE_EGL checks when GBM renderer is used #18347

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
Merged
merged 1 commit into from
Sep 29, 2023
Merged

[GTK] fix USE_EGL checks when GBM renderer is used #18347

merged 1 commit into from
Sep 29, 2023

Conversation

ThomasDevoogdt
Copy link
Contributor

@ThomasDevoogdt ThomasDevoogdt commented Sep 28, 2023 •
edited by webkit-early-warning-system
Loading

b751733

[GTK] fix USE_EGL checks when GBM renderer is used

https://bugs.webkit.org/show_bug.cgi?id=262169

Reviewed by Michael Catanzaro.

Regression since commit 81c064ddb4182a34a36def401025d223ca0d31ba.

webkitgtk-2.42.0/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp:39:10: fatal error: epoxy/egl.h: No such file or directory
   39 | #include <epoxy/egl.h>
      |          ^~~~~~~~~~~~~

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Canonical link: https://commits.webkit.org/266719.76@bugfix/USE_EGL-2.42

457ff03

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 wincairo
✅ 🛠 ios-sim   🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac ✅ 🛠 gtk
  🧪 ios-wk2-wpt ✅ 🧪 gtk-wk2
  🧪 api-ios   🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim
  🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@ThomasDevoogdt ThomasDevoogdt requested review from a team and cdumez as code owners September 28, 2023 13:36
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Sep 28, 2023 •
edited
Loading

EWS run on previous version of this PR (hash 7b9e815)

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ⏳ 🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac ✅ 🛠 gtk
  🧪 ios-wk2-wpt   🧪 gtk-wk2
  🧪 api-ios   🧪 mac-wk2   🧪 api-gtk
✅ 🛠 tv ⏳ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Sep 28, 2023 •
edited
Loading

EWS run on current version of this PR (hash 457ff03)

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe   🛠 wincairo
✅ 🛠 ios-sim   🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl   🧪 ios-wk2   🧪 api-mac ✅ 🛠 gtk
  🧪 ios-wk2-wpt ✅ 🧪 gtk-wk2
  🧪 api-ios   🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🛠 tv-sim
  🛠 🧪 merge ✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@ThomasDevoogdt ThomasDevoogdt changed the title [GTK] fix USE_EGL checks when GBM renderer is used [2.42] [GTK] fix USE_EGL checks when GBM renderer is used Sep 28, 2023
@mcatanzaro mcatanzaro added the merge-queue Applied to send a pull request to merge-queue label Sep 28, 2023
@ThomasDevoogdt
Copy link
Contributor Author

ThomasDevoogdt commented Sep 29, 2023 •
edited
Loading

@mcatanzaro, @carlosgcampos, @cdumez, it seems that buildbot also fails on this commit, while on main, it succeeded immediately.

@ThomasDevoogdt ThomasDevoogdt mentioned this pull request Sep 29, 2023
Merged
@ThomasDevoogdt
Copy link
Contributor Author

Linked PR:

@mcatanzaro mcatanzaro added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merge-queue Applied to send a pull request to merge-queue labels Sep 29, 2023
@ThomasDevoogdt @mcatanzaro
[GTK] fix USE_EGL checks when GBM renderer is used
b751733 
https://bugs.webkit.org/show_bug.cgi?id=262169

Reviewed by Michael Catanzaro.

Regression since commit 81c064d.

webkitgtk-2.42.0/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreDMABuf.cpp:39:10: fatal error: epoxy/egl.h: No such file or directory
   39 | #include <epoxy/egl.h>
      |          ^~~~~~~~~~~~~

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Canonical link: https://commits.webkit.org/266719.76@bugfix/USE_EGL-2.42
@webkit-commit-queue webkit-commit-queue changed the title [2.42] [GTK] fix USE_EGL checks when GBM renderer is used [GTK] fix USE_EGL checks when GBM renderer is used Sep 29, 2023
@webkit-commit-queue
Copy link
Collaborator

Committed 266719.76@bugfix/USE_EGL-2.42 (b751733): https://commits.webkit.org/266719.76@bugfix/USE_EGL-2.42

Reviewed commits have been landed. Closing PR #18347 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit b751733 into WebKit:webkitglib/2.42 Sep 29, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Sep 29, 2023
@ThomasDevoogdt ThomasDevoogdt deleted the bugfix/USE_EGL-2.42 branch September 29, 2023 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcatanzaro mcatanzaro mcatanzaro approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

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

Successfully merging this pull request may close these issues.
4 participants
@ThomasDevoogdt @webkit-early-warning-system @webkit-commit-queue @mcatanzaro