Re: [Mesa-dev] [PATCH 01/22] gallium/ilo: cleanup intel_winsys.h
On Tue, Aug 19, 2014 at 7:20 AM, Emil Velikov emil.l.veli...@gmail.com wrote: Make the header location, inclusion and contents more common with its i915,r* and nouveau counterparts: - Move the header within intel/drm. - Separate out intel_winsys_create_for_fd into 'drm_public' header. - Cleanup the compiler includes. The latter two sound fine to me, but do you have a real need to move intel_winsys.h into drm/? It is supposed to be OS-neutral so that the pipe driver stays OS-neutral, not being tied to DRM. Cc: Chia-I Wu olva...@gmail.com Signed-off-by: Emil Velikov emil.l.veli...@gmail.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 2 +- src/gallium/drivers/ilo/Android.mk | 3 +- src/gallium/drivers/ilo/Makefile.am| 1 - src/gallium/drivers/ilo/ilo_3d.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen6.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen7.h | 2 +- src/gallium/drivers/ilo/ilo_query.c| 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/winsys/intel/drm/intel_drm_public.h| 8 + src/gallium/winsys/intel/drm/intel_drm_winsys.c| 3 +- src/gallium/winsys/intel/drm/intel_winsys.h| 317 src/gallium/winsys/intel/intel_winsys.h| 320 - 18 files changed, 340 insertions(+), 336 deletions(-) create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h create mode 100644 src/gallium/winsys/intel/drm/intel_winsys.h delete mode 100644 src/gallium/winsys/intel/intel_winsys.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 4ef94de..dd55a71 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 2b06663..39de3a6 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 04d4da8..75213d4 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/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c index 9006376..daedf59 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_3d.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_3d_pipeline.h #include ilo_blit.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.c b/src/gallium/drivers/ilo/ilo_3d_pipeline.c index 1f18bbb..ee43372 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_blitter.h #include ilo_context.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c index de47e8d..3d9065c 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c @@ -26,7 +26,7 @@ *Chia-I Wu o...@lunarg.com */ -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_cp.h #include ilo_3d_pipeline.h diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c index ec99e0f..0a1996c 100644 --- a/src/gallium/drivers/ilo/ilo_cp.c +++ b/src/gallium/drivers/ilo/ilo_cp.c @@ -26,7 +26,7 @@ */ #include genhw/genhw.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_cp.h diff --git a/src/gallium/drivers/ilo/ilo_cp.h b/src/gallium/drivers/ilo/ilo_cp.h index 15b6604..83eee34 100644 ---
Re: [Mesa-dev] [PATCH 01/22] gallium/ilo: cleanup intel_winsys.h
On 19/08/14 09:07, Chia-I Wu wrote: On Tue, Aug 19, 2014 at 7:20 AM, Emil Velikov emil.l.veli...@gmail.com wrote: Make the header location, inclusion and contents more common with its i915,r* and nouveau counterparts: - Move the header within intel/drm. - Separate out intel_winsys_create_for_fd into 'drm_public' header. - Cleanup the compiler includes. The latter two sound fine to me, but do you have a real need to move intel_winsys.h into drm/? It is supposed to be OS-neutral so that the pipe driver stays OS-neutral, not being tied to DRM. No real need just the following ideas - Ease 'make dist' - see patch 07/22 from this series. - Gets things more obvious by prefixing the winsys header inclusions with $(hw)/drm or sw/$(platform). - This is how the cool kids do it (radeon) :P One could argue that ilo's approach is correct, and everyone else is encouraged to follow, yet I'm taking the route of least resistance :) -Emil Cc: Chia-I Wu olva...@gmail.com Signed-off-by: Emil Velikov emil.l.veli...@gmail.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 2 +- src/gallium/drivers/ilo/Android.mk | 3 +- src/gallium/drivers/ilo/Makefile.am| 1 - src/gallium/drivers/ilo/ilo_3d.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen6.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen7.h | 2 +- src/gallium/drivers/ilo/ilo_query.c| 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/winsys/intel/drm/intel_drm_public.h| 8 + src/gallium/winsys/intel/drm/intel_drm_winsys.c| 3 +- src/gallium/winsys/intel/drm/intel_winsys.h| 317 src/gallium/winsys/intel/intel_winsys.h| 320 - 18 files changed, 340 insertions(+), 336 deletions(-) create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h create mode 100644 src/gallium/winsys/intel/drm/intel_winsys.h delete mode 100644 src/gallium/winsys/intel/intel_winsys.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 4ef94de..dd55a71 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 2b06663..39de3a6 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 04d4da8..75213d4 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/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c index 9006376..daedf59 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_3d.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_3d_pipeline.h #include ilo_blit.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.c b/src/gallium/drivers/ilo/ilo_3d_pipeline.c index 1f18bbb..ee43372 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_blitter.h #include ilo_context.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c index de47e8d..3d9065c 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c @@ -26,7 +26,7 @@ *Chia-I Wu o...@lunarg.com */ -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_cp.h #include ilo_3d_pipeline.h diff --git
Re: [Mesa-dev] [PATCH 01/22] gallium/ilo: cleanup intel_winsys.h
On Tue, Aug 19, 2014 at 4:26 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 19/08/14 09:07, Chia-I Wu wrote: On Tue, Aug 19, 2014 at 7:20 AM, Emil Velikov emil.l.veli...@gmail.com wrote: Make the header location, inclusion and contents more common with its i915,r* and nouveau counterparts: - Move the header within intel/drm. - Separate out intel_winsys_create_for_fd into 'drm_public' header. - Cleanup the compiler includes. The latter two sound fine to me, but do you have a real need to move intel_winsys.h into drm/? It is supposed to be OS-neutral so that the pipe driver stays OS-neutral, not being tied to DRM. No real need just the following ideas - Ease 'make dist' - see patch 07/22 from this series. - Gets things more obvious by prefixing the winsys header inclusions with $(hw)/drm or sw/$(platform). - This is how the cool kids do it (radeon) :P One could argue that ilo's approach is correct, and everyone else is encouraged to follow, yet I'm taking the route of least resistance :) How about splitting intel_winsys_create_for_fd() out to the public header, and move intel_winsys.h to drivers/ilo/? Other cool kids appear to do it that way. -Emil Cc: Chia-I Wu olva...@gmail.com Signed-off-by: Emil Velikov emil.l.veli...@gmail.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 2 +- src/gallium/drivers/ilo/Android.mk | 3 +- src/gallium/drivers/ilo/Makefile.am| 1 - src/gallium/drivers/ilo/ilo_3d.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen6.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen7.h | 2 +- src/gallium/drivers/ilo/ilo_query.c| 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/winsys/intel/drm/intel_drm_public.h| 8 + src/gallium/winsys/intel/drm/intel_drm_winsys.c| 3 +- src/gallium/winsys/intel/drm/intel_winsys.h| 317 src/gallium/winsys/intel/intel_winsys.h| 320 - 18 files changed, 340 insertions(+), 336 deletions(-) create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h create mode 100644 src/gallium/winsys/intel/drm/intel_winsys.h delete mode 100644 src/gallium/winsys/intel/intel_winsys.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 4ef94de..dd55a71 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 2b06663..39de3a6 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 04d4da8..75213d4 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/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c index 9006376..daedf59 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_3d.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_3d_pipeline.h #include ilo_blit.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.c b/src/gallium/drivers/ilo/ilo_3d_pipeline.c index 1f18bbb..ee43372 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_blitter.h #include ilo_context.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c index de47e8d..3d9065c 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c +++
Re: [Mesa-dev] [PATCH 01/22] gallium/ilo: cleanup intel_winsys.h
On 19/08/14 09:39, Chia-I Wu wrote: On Tue, Aug 19, 2014 at 4:26 PM, Emil Velikov emil.l.veli...@gmail.com wrote: On 19/08/14 09:07, Chia-I Wu wrote: On Tue, Aug 19, 2014 at 7:20 AM, Emil Velikov emil.l.veli...@gmail.com wrote: Make the header location, inclusion and contents more common with its i915,r* and nouveau counterparts: - Move the header within intel/drm. - Separate out intel_winsys_create_for_fd into 'drm_public' header. - Cleanup the compiler includes. The latter two sound fine to me, but do you have a real need to move intel_winsys.h into drm/? It is supposed to be OS-neutral so that the pipe driver stays OS-neutral, not being tied to DRM. No real need just the following ideas - Ease 'make dist' - see patch 07/22 from this series. - Gets things more obvious by prefixing the winsys header inclusions with $(hw)/drm or sw/$(platform). - This is how the cool kids do it (radeon) :P One could argue that ilo's approach is correct, and everyone else is encouraged to follow, yet I'm taking the route of least resistance :) How about splitting intel_winsys_create_for_fd() out to the public header, and move intel_winsys.h to drivers/ilo/? Other cool kids appear to do it that way. Like i915g, svga and nouveau ? Sure fine with me :) -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 01/22] 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 intel/drm. - Separate out intel_winsys_create_for_fd into 'drm_public' header. - Cleanup the compiler includes. Cc: Chia-I Wu olva...@gmail.com Signed-off-by: Emil Velikov emil.l.veli...@gmail.com --- .../auxiliary/target-helpers/inline_drm_helper.h | 2 +- src/gallium/drivers/ilo/Android.mk | 3 +- src/gallium/drivers/ilo/Makefile.am| 1 - src/gallium/drivers/ilo/ilo_3d.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline.c | 2 +- src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c | 2 +- src/gallium/drivers/ilo/ilo_cp.c | 2 +- src/gallium/drivers/ilo/ilo_cp.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen6.h | 2 +- src/gallium/drivers/ilo/ilo_gpe_gen7.h | 2 +- src/gallium/drivers/ilo/ilo_query.c| 2 +- src/gallium/drivers/ilo/ilo_resource.h | 2 +- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_shader.c | 2 +- src/gallium/winsys/intel/drm/intel_drm_public.h| 8 + src/gallium/winsys/intel/drm/intel_drm_winsys.c| 3 +- src/gallium/winsys/intel/drm/intel_winsys.h| 317 src/gallium/winsys/intel/intel_winsys.h| 320 - 18 files changed, 340 insertions(+), 336 deletions(-) create mode 100644 src/gallium/winsys/intel/drm/intel_drm_public.h create mode 100644 src/gallium/winsys/intel/drm/intel_winsys.h delete mode 100644 src/gallium/winsys/intel/intel_winsys.h diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h index 4ef94de..dd55a71 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 2b06663..39de3a6 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 04d4da8..75213d4 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/drivers/ilo/ilo_3d.c b/src/gallium/drivers/ilo/ilo_3d.c index 9006376..daedf59 100644 --- a/src/gallium/drivers/ilo/ilo_3d.c +++ b/src/gallium/drivers/ilo/ilo_3d.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_3d_pipeline.h #include ilo_blit.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline.c b/src/gallium/drivers/ilo/ilo_3d_pipeline.c index 1f18bbb..ee43372 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline.c @@ -26,7 +26,7 @@ */ #include util/u_prim.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_blitter.h #include ilo_context.h diff --git a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c index de47e8d..3d9065c 100644 --- a/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c +++ b/src/gallium/drivers/ilo/ilo_3d_pipeline_dump.c @@ -26,7 +26,7 @@ *Chia-I Wu o...@lunarg.com */ -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_cp.h #include ilo_3d_pipeline.h diff --git a/src/gallium/drivers/ilo/ilo_cp.c b/src/gallium/drivers/ilo/ilo_cp.c index ec99e0f..0a1996c 100644 --- a/src/gallium/drivers/ilo/ilo_cp.c +++ b/src/gallium/drivers/ilo/ilo_cp.c @@ -26,7 +26,7 @@ */ #include genhw/genhw.h -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_cp.h diff --git a/src/gallium/drivers/ilo/ilo_cp.h b/src/gallium/drivers/ilo/ilo_cp.h index 15b6604..83eee34 100644 --- a/src/gallium/drivers/ilo/ilo_cp.h +++ b/src/gallium/drivers/ilo/ilo_cp.h @@ -28,7 +28,7 @@ #ifndef ILO_CP_H #define ILO_CP_H -#include intel_winsys.h +#include intel/drm/intel_winsys.h #include ilo_common.h diff --git a/src/gallium/drivers/ilo/ilo_gpe_gen6.h b/src/gallium/drivers/ilo/ilo_gpe_gen6.h index 8e394de..e769d2f 100644 --- a/src/gallium/drivers/ilo/ilo_gpe_gen6.h +++
