[Mesa-dev] [PATCH 17/20] glx: cleanup unneeded headers

[Ian Romanick]

This patch is

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

On 03/04/2014 11:12 PM, Emil Velikov wrote:
>  - xf86dri.h is the old dri1 header, not required by dri2 nor dri3
>  - fold xf86drm.h inclusiong inside dri2.h
>  - dri3_glx does not have any drm specific dependencies
>  - glapi.h is not required by the dri2 and dri3 codepaths
> 
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/glx/dri2.c                                           | 1 -
>  src/glx/dri2.h                                           | 1 +
>  src/glx/dri2_glx.c                                       | 3 ---
>  src/glx/dri2_query_renderer.c                            | 1 -
>  src/glx/dri3_glx.c                                       | 3 ---
>  src/glx/glxcmds.c                                        | 2 --
>  src/glx/tests/query_renderer_implementation_unittest.cpp | 1 -
>  7 files changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/src/glx/dri2.c b/src/glx/dri2.c
> index 7e8fdea..7cb9d2d 100644
> --- a/src/glx/dri2.c
> +++ b/src/glx/dri2.c
> @@ -38,7 +38,6 @@
>  #include <X11/extensions/Xext.h>
>  #include <X11/extensions/extutil.h>
>  #include <X11/extensions/dri2proto.h>
> -#include "xf86drm.h"
>  #include "dri2.h"
>  #include "glxclient.h"
>  #include "GL/glxext.h"
> diff --git a/src/glx/dri2.h b/src/glx/dri2.h
> index 90efde8..72a608c 100644
> --- a/src/glx/dri2.h
> +++ b/src/glx/dri2.h
> @@ -33,6 +33,7 @@
>  #ifndef _DRI2_H_
>  #define _DRI2_H_
>  
> +#include <xf86drm.h>
>  #include <X11/extensions/Xfixes.h>
>  #include <X11/extensions/dri2tokens.h>
>  
> diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
> index deeffa4..75fc951 100644
> --- a/src/glx/dri2_glx.c
> +++ b/src/glx/dri2_glx.c
> @@ -37,17 +37,14 @@
>  #include <X11/Xlib-xcb.h>
>  #include <xcb/xcb.h>
>  #include <xcb/dri2.h>
> -#include "glapi.h"
>  #include "glxclient.h"
>  #include <X11/extensions/dri2proto.h>
> -#include "xf86dri.h"
>  #include <dlfcn.h>
>  #include <fcntl.h>
>  #include <unistd.h>
>  #include <sys/types.h>
>  #include <sys/mman.h>
>  #include <sys/time.h>
> -#include "xf86drm.h"
>  #include "dri2.h"
>  #include "dri_common.h"
>  #include "dri2_priv.h"
> diff --git a/src/glx/dri2_query_renderer.c b/src/glx/dri2_query_renderer.c
> index 95560cb..a28ced6 100644
> --- a/src/glx/dri2_query_renderer.c
> +++ b/src/glx/dri2_query_renderer.c
> @@ -25,7 +25,6 @@
>  
>  #include "glxclient.h"
>  #include "glx_error.h"
> -#include "xf86drm.h"
>  #include "dri2.h"
>  #include "dri_interface.h"
>  #include "dri2_priv.h"
> diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
> index 8fbf125..f27a773 100644
> --- a/src/glx/dri3_glx.c
> +++ b/src/glx/dri3_glx.c
> @@ -65,9 +65,7 @@
>  #include <xcb/dri3.h>
>  #include <xcb/present.h>
>  #include <GL/gl.h>
> -#include "glapi.h"
>  #include "glxclient.h"
> -#include "xf86dri.h"
>  #include <dlfcn.h>
>  #include <fcntl.h>
>  #include <unistd.h>
> @@ -75,7 +73,6 @@
>  #include <sys/mman.h>
>  #include <sys/time.h>
>  
> -#include "xf86drm.h"
>  #include "dri_common.h"
>  #include "dri3_priv.h"
>  #include "loader.h"
> diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c
> index 837d8a2..4b17d7c 100644
> --- a/src/glx/glxcmds.c
> +++ b/src/glx/glxcmds.c
> @@ -48,9 +48,7 @@
>  #ifdef XF86VIDMODE
>  #include <X11/extensions/xf86vmode.h>
>  #endif
> -#include "xf86dri.h"
>  #endif
> -#else
>  #endif
>  
>  #include <X11/Xlib-xcb.h>
> diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
> index 2bf8843..35b3972 100644
> --- a/src/glx/tests/query_renderer_implementation_unittest.cpp
> +++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
> @@ -29,7 +29,6 @@
>  extern "C" {
>  #include "glxclient.h"
>  #include "glx_error.h"
> -#include "xf86drm.h"
>  #include "dri2.h"
>  #include "dri_interface.h"
>  #include "dri2_priv.h"
>