Commit f41a6539 authored by Emil Velikov's avatar Emil Velikov

glx: cleanup unneeded headers

 - 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: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: default avatarJon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: default avatarIan Romanick <ian.d.romanick@intel.com>
parent e5214dd8
......@@ -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"
......
......@@ -33,6 +33,7 @@
#ifndef _DRI2_H_
#define _DRI2_H_
#include <xf86drm.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/dri2tokens.h>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -48,9 +48,7 @@
#ifdef XF86VIDMODE
#include <X11/extensions/xf86vmode.h>
#endif
#include "xf86dri.h"
#endif
#else
#endif
#include <X11/Xlib-xcb.h>
......
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment