Skip to content

Fix EGL Window creation and prevent GLFW-Wayland from SEGFAULTING #931

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

Open
FrostKiwi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix EGL Window creation and prevent GLFW-Wayland from SEGFAULTING #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d029be
Force EXT_image_dma_buf to not be used, because it is not supported o…
FrostKiwi May 14, 2020
cc334db
Since wl_egl_window version 3, eglPointerIsDereferencable() uses a ha…
FrostKiwi May 14, 2020
e341019
Force EXT_image_dma_buf to not be used, because it is not supported o…
FrostKiwi May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ports/graphics/mesa-dri/dragonfly/patch-src_egl_drivers_dri2_egl_dri2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 2e51d28a8b9..95ee2f3a7b1 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1005,8 +1005,8 @@ dri2_setup_screen(_EGLDisplay *disp)
#ifdef HAVE_LIBDRM
if (dri2_dpy->image->base.version >= 8 &&
dri2_dpy->image->createImageFromDmaBufs) {
- disp->Extensions.EXT_image_dma_buf_import = EGL_TRUE;
- disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_TRUE;
+ disp->Extensions.EXT_image_dma_buf_import = EGL_FALSE;
+ disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_FALSE;
}
#endif
}
13 changes: 13 additions & 0 deletions ports/graphics/mesa-dri/dragonfly/patch-src_egl_drivers_dri2_platform_wayland.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index c4177f8799c..0dbc7aa4803 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -1347,7 +1347,7 @@ registry_handle_global_drm(void *data, struct wl_registry *registry,
dri2_dpy->wl_drm =
wl_registry_bind(registry, name, &wl_drm_interface, MIN2(version, 2));
wl_drm_add_listener(dri2_dpy->wl_drm, &drm_listener, dri2_dpy);
- } else if (strcmp(interface, "zwp_linux_dmabuf_v1") == 0 && version >= 3) {
+ } else if (false && strcmp(interface, "zwp_linux_dmabuf_v1") == 0 && version >= 3) {
dri2_dpy->wl_dmabuf =
wl_registry_bind(registry, name, &zwp_linux_dmabuf_v1_interface,
MIN2(version, 3));
13 changes: 13 additions & 0 deletions ports/graphics/mesa-dri/dragonfly/patch-src_egl_main_eglglobals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 6811048bdf7..5eefbc9187b 100644
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -136,7 +136,7 @@ _eglPointerIsDereferencable(void *p)
{
uintptr_t addr = (uintptr_t) p;
const long page_size = getpagesize();
-#ifdef HAVE_MINCORE
+#if 0
unsigned char valid = 0;

if (p == NULL)