Attachment 123964 Details for Bug 95159 – glx: Fix build broken by 4e2c9a04354b6b133845b8b93c0c5d34261a91d0

[patch] glx: Fix build broken by 4e2c9a04354b6b133845b8b93c0c5d34261a91d0

0001-glx-Fix-build-broken-by-4e2c9a04354b6b133845b8b93c0c.patch (text/plain), 1.04 KB, created by Dieter Nützel on 2016-05-22 13:52:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dieter Nützel

Created: 2016-05-22 13:52:01 UTC

Size: 1.04 KB

patch

obsolete

>From fa018ecd88c8145b3975bf867ac5049c4df230c3 Mon Sep 17 00:00:00 2001
>From: Tom Stellard <thomas.stellard@amd.com>
>Date: Fri, 20 May 2016 17:13:06 -0700
>Subject: [PATCH] glx: Fix build broken by
> 4e2c9a04354b6b133845b8b93c0c5d34261a91d0
>
>This commit caused a build failure with these configure args:
>
>./autogen.sh --disable-dri3 --disable-xvmc
>--with-gallium-drivers=swrast --disable-gallium-llvm
> --with-egl-platforms=drm --with-dri-drivers=no --enable-texture-float
>---
> src/glx/glxcmds.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
>index 63f4921..4881ddb 100644
>--- a/src/glx/glxcmds.c
>+++ b/src/glx/glxcmds.c
>@@ -2693,7 +2693,7 @@ __glXGetUST(int64_t * ust)
> }
> #endif /* GLX_DIRECT_RENDERING */
> 
>-#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
>+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) && !defined(MESA_EGL_NO_X11_HEADERS)
> 
> GLAPI int GLAPIENTRY
> MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 95159: 123283 | 123964

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.