[Mesa-dev] [PATCH] glx: Back DRI3 enablement out of the stable branch.

[Ian Romanick]

On 11/12/2013 04:08 PM, Eric Anholt wrote:
> After more testing (everyone else trying to build the stack is having as
> much trouble as I had, even after the problems I had were fixed), it
> really feels like dri3 is not something we're ready to support in this
> stable branch.  The .c/.h code will remain here to enable easier
> cherry-picking from master, and everything stays on master so we can ship
> a solid DRI3 in 3 months.

We probably could get this sorted out, but it would probably mean either
slipping the release a bit or having some other things not get the
polish they need.  Sadly, this seems like the best choice.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

> ---
>  configure.ac        | 12 +++---------
>  src/glx/Makefile.am |  2 --
>  src/glx/glxext.c    |  2 --
>  3 files changed, 3 insertions(+), 13 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 8fb5e0d..c6e437e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -34,9 +34,6 @@ LIBDRM_NVVIEUX_REQUIRED=2.4.33
>  LIBDRM_NOUVEAU_REQUIRED="2.4.33 libdrm >= 2.4.41"
>  LIBDRM_FREEDRENO_REQUIRED=2.4.39
>  DRI2PROTO_REQUIRED=2.6
> -DRI3PROTO_REQUIRED=1.0
> -PRESENTPROTO_REQUIRED=1.0
> -LIBUDEV_REQUIRED=151
>  GLPROTO_REQUIRED=1.4.14
>  
>  dnl Check for progs
> @@ -811,13 +808,10 @@ xyesno)
>          fi
>          PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
>          GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV libdrm >= $LIBDRM_REQUIRED"
> -        PKG_CHECK_MODULES([DRI3PROTO], [dri3proto >= $DRI3PROTO_REQUIRED])
> -        PKG_CHECK_MODULES([PRESENTPROTO], [presentproto >= $PRESENTPROTO_REQUIRED])
> -        PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED])
>      fi
>  
>      # find the DRI deps for libGL
> -    dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8 xcb-dri3 xcb-present xcb-sync xshmfence"
> +    dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8"
>  
>      # add xf86vidmode if available
>      PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
> @@ -827,8 +821,8 @@ xyesno)
>  
>      PKG_CHECK_MODULES([DRIGL], [$dri_modules])
>      GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
> -    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS $LIBUDEV_CFLAGS"
> -    GL_LIB_DEPS="$DRIGL_LIBS $LIBUDEV_LIBS"
> +    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
> +    GL_LIB_DEPS="$DRIGL_LIBS"
>  
>      # need DRM libs, $PTHREAD_LIBS, etc.
>      GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
> diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
> index ae296b9..f66c4bd 100644
> --- a/src/glx/Makefile.am
> +++ b/src/glx/Makefile.am
> @@ -94,8 +94,6 @@ libglx_la_SOURCES = \
>  	  dri2_glx.c \
>  	  dri2.c \
>  	  dri2_query_renderer.c \
> -          dri3_glx.c \
> -          dri3_common.c \
>  	  applegl_glx.c
>  
>  GL_LIBS = \
> diff --git a/src/glx/glxext.c b/src/glx/glxext.c
> index c6e4d9f..b31d8fe 100644
> --- a/src/glx/glxext.c
> +++ b/src/glx/glxext.c
> @@ -865,8 +865,6 @@ __glXInitialize(Display * dpy)
>      ** (e.g., those called in AllocAndFetchScreenConfigs).
>      */
>     if (glx_direct && glx_accel) {
> -      if (!getenv("LIBGL_DRI3_DISABLE"))
> -         dpyPriv->dri3Display = dri3_create_display(dpy);
>        dpyPriv->dri2Display = dri2CreateDisplay(dpy);
>        dpyPriv->driDisplay = driCreateDisplay(dpy);
>     }
>