frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: sanitze handling of "Debug" Option for "dmabuf_capable" 

With the appearance of the this new Option the X Server would crash if the
option is not set.

Default dmabuf_capable to off/FALSE for now - a user without knowledge about
this option does not want to enable it until its save.

Fixes: d11d5bb80 ("glamor: Hide new DRI behind Option "Debug" "dmabuf_capable")
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Tobias Klausmann 2018-03-30 22:31:46 +02:00 committed by Adam Jackson
parent debf75bd0b
commit 258081759f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glamor/glamor_egl.c
View File

@ -960,9 +960,13 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
if (epoxy_has_egl_extension(glamor_egl->display, if (epoxy_has_egl_extension(glamor_egl->display,
"EGL_EXT_image_dma_buf_import") && "EGL_EXT_image_dma_buf_import") &&
epoxy_has_egl_extension(glamor_egl->display, epoxy_has_egl_extension(glamor_egl->display,
"EGL_EXT_image_dma_buf_import_modifiers")) "EGL_EXT_image_dma_buf_import_modifiers")) {
if (xf86Info.debug != NULL)
glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug, glamor_egl->dmabuf_capable = !!strstr(xf86Info.debug,
"dmabuf_capable"); "dmabuf_capable");
else
glamor_egl->dmabuf_capable = FALSE;
}
#endif #endif
glamor_egl->saved_free_screen = scrn->FreeScreen; glamor_egl->saved_free_screen = scrn->FreeScreen;