Mesa (master): egl: fix libdrm-less builds

[GitLab Mirror]

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

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Feb 27 15:26:08 2019 +0000

egl: fix libdrm-less builds

This function was never used, and isn't properly guarded by HAVE_LIBDRM,
breaking the build on systems that don't have libdrm.

Let's just remove it.

Fixes: 7552fcb7b9b98392e6a8 "egl: add base EGL_EXT_device_base implementation"
Reported-by: Timo Aaltonen <tjaalton at debian.org>
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Acked-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/main/egldevice.c | 12 ------------
 src/egl/main/egldevice.h |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/src/egl/main/egldevice.c b/src/egl/main/egldevice.c
index 4878039be0e..c5c9a21273a 100644
--- a/src/egl/main/egldevice.c
+++ b/src/egl/main/egldevice.c
@@ -202,18 +202,6 @@ _eglDeviceSupports(_EGLDevice *dev, _EGLDeviceExtension ext)
    };
 }
 
-/* Ideally we'll have an extension which passes the render node,
- * instead of the card one + magic.
- *
- * Then we can move this in _eglQueryDeviceStringEXT below. Until then
- * keep it separate.
- */
-const char *
-_eglGetDRMDeviceRenderNode(_EGLDevice *dev)
-{
-   return dev->device->nodes[DRM_NODE_RENDER];
-}
-
 EGLBoolean
 _eglQueryDeviceAttribEXT(_EGLDevice *dev, EGLint attribute,
                          EGLAttrib *value)
diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h
index 83a47d5eacc..883f96f8e30 100644
--- a/src/egl/main/egldevice.h
+++ b/src/egl/main/egldevice.h
@@ -68,9 +68,6 @@ typedef enum _egl_device_extension _EGLDeviceExtension;
 EGLBoolean
 _eglDeviceSupports(_EGLDevice *dev, _EGLDeviceExtension ext);
 
-const char *
-_eglGetDRMDeviceRenderNode(_EGLDevice *dev);
-
 EGLBoolean
 _eglQueryDeviceAttribEXT(_EGLDevice *dev, EGLint attribute,
                          EGLAttrib *value);