From 513bc5d90b8e9237bd6a04da5d0dee175ff134f6 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 22 Jun 2015 14:06:13 +0800 Subject: [PATCH] ilo: move ilo_format.[ch] out of core They provide PIPE_FORMAT_x to GEN6_FORMAT_x translation as well as some convenient helpers. Move them out of core. --- src/gallium/drivers/ilo/Makefile.sources | 4 ++-- src/gallium/drivers/ilo/{core => }/ilo_format.c | 4 ++-- src/gallium/drivers/ilo/{core => }/ilo_format.h | 4 ++-- src/gallium/drivers/ilo/ilo_screen.c | 2 +- src/gallium/drivers/ilo/ilo_state.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/gallium/drivers/ilo/{core => }/ilo_format.c (99%) rename src/gallium/drivers/ilo/{core => }/ilo_format.h (99%) diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index ed024e3a866..e1bbb9a0781 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -15,8 +15,6 @@ C_SOURCES := \ core/ilo_debug.h \ core/ilo_dev.c \ core/ilo_dev.h \ - core/ilo_format.c \ - core/ilo_format.h \ core/ilo_image.c \ core/ilo_image.h \ core/ilo_state_cc.c \ @@ -60,6 +58,8 @@ C_SOURCES := \ ilo_cp.h \ ilo_draw.c \ ilo_draw.h \ + ilo_format.c \ + ilo_format.h \ ilo_gpgpu.c \ ilo_gpgpu.h \ ilo_public.h \ diff --git a/src/gallium/drivers/ilo/core/ilo_format.c b/src/gallium/drivers/ilo/ilo_format.c similarity index 99% rename from src/gallium/drivers/ilo/core/ilo_format.c rename to src/gallium/drivers/ilo/ilo_format.c index b96f71c0021..ca7e6b55ca1 100644 --- a/src/gallium/drivers/ilo/core/ilo_format.c +++ b/src/gallium/drivers/ilo/ilo_format.c @@ -26,8 +26,8 @@ */ #include "genhw/genhw.h" -#include "ilo_state_surface.h" -#include "ilo_state_vf.h" +#include "core/ilo_state_surface.h" +#include "core/ilo_state_vf.h" #include "ilo_format.h" bool diff --git a/src/gallium/drivers/ilo/core/ilo_format.h b/src/gallium/drivers/ilo/ilo_format.h similarity index 99% rename from src/gallium/drivers/ilo/core/ilo_format.h rename to src/gallium/drivers/ilo/ilo_format.h index 6b73ea1dad7..4e955c09c14 100644 --- a/src/gallium/drivers/ilo/core/ilo_format.h +++ b/src/gallium/drivers/ilo/ilo_format.h @@ -29,8 +29,8 @@ #define ILO_FORMAT_H #include "genhw/genhw.h" -#include "ilo_core.h" -#include "ilo_dev.h" + +#include "ilo_common.h" bool ilo_format_support_vb(const struct ilo_dev *dev, diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c index b75a2590b2b..94105559b80 100644 --- a/src/gallium/drivers/ilo/ilo_screen.c +++ b/src/gallium/drivers/ilo/ilo_screen.c @@ -31,10 +31,10 @@ #include "vl/vl_decoder.h" #include "vl/vl_video_buffer.h" #include "genhw/genhw.h" /* for GEN6_REG_TIMESTAMP */ -#include "core/ilo_format.h" #include "core/intel_winsys.h" #include "ilo_context.h" +#include "ilo_format.h" #include "ilo_resource.h" #include "ilo_transfer.h" /* for ILO_TRANSFER_MAP_BUFFER_ALIGNMENT */ #include "ilo_public.h" diff --git a/src/gallium/drivers/ilo/ilo_state.c b/src/gallium/drivers/ilo/ilo_state.c index 62e31809fb7..4252dbe5613 100644 --- a/src/gallium/drivers/ilo/ilo_state.c +++ b/src/gallium/drivers/ilo/ilo_state.c @@ -26,7 +26,6 @@ */ #include "core/ilo_builder_3d.h" /* for gen6_3d_translate_pipe_prim() */ -#include "core/ilo_format.h" #include "util/u_dual_blend.h" #include "util/u_dynarray.h" #include "util/u_framebuffer.h" @@ -35,6 +34,7 @@ #include "util/u_upload_mgr.h" #include "ilo_context.h" +#include "ilo_format.h" #include "ilo_resource.h" #include "ilo_shader.h" #include "ilo_state.h" -- 2.30.2