From 664c2d76947a855ddfffdc8448b46d1633b88059 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 16 Aug 2014 19:34:10 +0100 Subject: [PATCH] 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 Signed-off-by: Emil Velikov Reviewed-by: Chia-I Wu --- src/gallium/auxiliary/target-helpers/inline_drm_helper.h | 2 +- src/gallium/drivers/ilo/Android.mk | 3 +-- src/gallium/drivers/ilo/Makefile.am | 1 - src/gallium/{winsys/intel => drivers/ilo}/intel_winsys.h | 3 --- src/gallium/winsys/intel/drm/Makefile.am | 1 + src/gallium/winsys/intel/drm/intel_drm_public.h | 8 ++++++++ src/gallium/winsys/intel/drm/intel_drm_winsys.c | 3 ++- 7 files changed, 13 insertions(+), 8 deletions(-) rename src/gallium/{winsys/intel => drivers/ilo}/intel_winsys.h (99%) create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 4ef94de259c..dd55a71d10b 100644 --- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h +++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h @@ -19,7 +19,7 @@ #endif #if GALLIUM_ILO -#include "intel/intel_winsys.h" +#include "intel/drm/intel_drm_public.h" #include "ilo/ilo_public.h" #endif diff --git a/src/gallium/drivers/ilo/Android.mk b/src/gallium/drivers/ilo/Android.mk index 2b06663e2b6..39de3a6070c 100644 --- a/src/gallium/drivers/ilo/Android.mk +++ b/src/gallium/drivers/ilo/Android.mk @@ -28,8 +28,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - $(GALLIUM_TOP)/winsys/intel + $(LOCAL_PATH)/include LOCAL_SRC_FILES := $(C_SOURCES) diff --git a/src/gallium/drivers/ilo/Makefile.am b/src/gallium/drivers/ilo/Makefile.am index 04d4da8e43a..75213d46397 100644 --- a/src/gallium/drivers/ilo/Makefile.am +++ b/src/gallium/drivers/ilo/Makefile.am @@ -27,7 +27,6 @@ include Makefile.sources include $(top_srcdir)/src/gallium/Automake.inc AM_CPPFLAGS = \ - -I$(top_srcdir)/src/gallium/winsys/intel \ $(GALLIUM_DRIVER_CFLAGS) noinst_LTLIBRARIES = libilo.la diff --git a/src/gallium/winsys/intel/intel_winsys.h b/src/gallium/drivers/ilo/intel_winsys.h similarity index 99% rename from src/gallium/winsys/intel/intel_winsys.h rename to src/gallium/drivers/ilo/intel_winsys.h index 2f053146bb2..4ee35d7f5a9 100644 --- a/src/gallium/winsys/intel/intel_winsys.h +++ b/src/gallium/drivers/ilo/intel_winsys.h @@ -81,9 +81,6 @@ struct intel_winsys_info { bool has_gen7_sol_reset; }; -struct intel_winsys * -intel_winsys_create_for_fd(int fd); - void intel_winsys_destroy(struct intel_winsys *winsys); 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; -- 2.30.2