diff options
author | Emil Velikov <[email protected]> | 2014-08-16 19:34:10 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2014-08-28 21:24:16 +0100 |
commit | 664c2d76947a855ddfffdc8448b46d1633b88059 (patch) | |
tree | 466d4c827ac7054ac9e8e80b6efd960ddc31ed4d /src/gallium/winsys/intel/drm | |
parent | 4ca203f6a1c01299fc7b7d0aa6f10d31d92ee6e3 (diff) |
gallium/ilo: cleanup intel_winsys.h
Make the header location, inclusion and contents more common with
its i915,r* and nouveau counterparts:
- Move the header within drivers/ilo.
- Separate out intel_winsys_create_for_fd into 'drm_public' header.
- Cleanup the compiler includes.
v2: Move the header to drivers/ilo. Suggested by Chia-I.
v3: Correct intel_winsys.h inclusion. Spotted by Chia-I.
Cc: Chia-I Wu <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Chia-I Wu <[email protected]>
Diffstat (limited to 'src/gallium/winsys/intel/drm')
-rw-r--r-- | src/gallium/winsys/intel/drm/Makefile.am | 1 | ||||
-rw-r--r-- | src/gallium/winsys/intel/drm/intel_drm_public.h | 8 | ||||
-rw-r--r-- | src/gallium/winsys/intel/drm/intel_drm_winsys.c | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/gallium/winsys/intel/drm/Makefile.am b/src/gallium/winsys/intel/drm/Makefile.am index 30f44860766..fbe1ceaeb1e 100644 --- a/src/gallium/winsys/intel/drm/Makefile.am +++ b/src/gallium/winsys/intel/drm/Makefile.am @@ -25,6 +25,7 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ $(GALLIUM_WINSYS_CFLAGS) \ $(INTEL_CFLAGS) diff --git a/src/gallium/winsys/intel/drm/intel_drm_public.h b/src/gallium/winsys/intel/drm/intel_drm_public.h new file mode 100644 index 00000000000..0e39dfb6a0e --- /dev/null +++ b/src/gallium/winsys/intel/drm/intel_drm_public.h @@ -0,0 +1,8 @@ +#ifndef INTEL_DRM_PUBLIC_H +#define INTEL_DRM_PUBLIC_H + +struct intel_winsys; + +struct intel_winsys *intel_winsys_create_for_fd(int fd); + +#endif diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c index 2da7b02657a..7b542dcff37 100644 --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c @@ -41,7 +41,8 @@ #include "util/u_inlines.h" #include "util/u_memory.h" #include "util/u_debug.h" -#include "../intel_winsys.h" +#include "ilo/intel_winsys.h" +#include "intel_drm_public.h" struct intel_winsys { int fd; |