Mesa (master): gbm: Fix build without gallium_drm_loader

Matt Turner mattst88 at kemper.freedesktop.org
Sun Aug 12 21:37:53 UTC 2012


Module: Mesa
Branch: master
Commit: 4c73282d2bfa8fa52acdb3ac32c5eca260bad792
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c73282d2bfa8fa52acdb3ac32c5eca260bad792

Author: Chí-Thanh Christopher Nguyễn <chithanh at gentoo.org>
Date:   Thu Aug  9 17:42:24 2012 +0200

gbm: Fix build without gallium_drm_loader

pipe_loader_drm_probe_fd only exists if HAVE_PIPE_LOADER_DRM is defined.
Patch improved as suggested by Vadim A. Misbakh-Soloviov.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=52962

---

 src/gallium/targets/gbm/gbm.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/targets/gbm/gbm.c b/src/gallium/targets/gbm/gbm.c
index 7d2af51..8f46057 100644
--- a/src/gallium/targets/gbm/gbm.c
+++ b/src/gallium/targets/gbm/gbm.c
@@ -49,11 +49,13 @@ int
 gallium_screen_create(struct gbm_gallium_drm_device *gdrm)
 {
    struct pipe_loader_device *dev;
+#ifdef HAVE_PIPE_LOADER_DRM
    int ret;
 
    ret = pipe_loader_drm_probe_fd(&dev, gdrm->base.base.fd);
    if (!ret)
       return -1;
+#endif /* HAVE_PIPE_LOADER_DRM */
 
    gdrm->screen = pipe_loader_create_screen(dev, get_library_search_path());
    if (gdrm->screen == NULL) {




More information about the mesa-commit mailing list