From e9589a8fcf60f9d04ea31e6f84f43f9d10a636da Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 3 Dec 2014 18:02:38 -0500 Subject: [PATCH] freedreno/a4xx: fd4_util -> fd4_format Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/Makefile.sources | 4 ++-- src/gallium/drivers/freedreno/a4xx/fd4_blend.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_draw.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_emit.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_emit.h | 2 +- .../drivers/freedreno/a4xx/{fd4_util.c => fd4_format.c} | 2 +- .../drivers/freedreno/a4xx/{fd4_util.h => fd4_format.h} | 0 src/gallium/drivers/freedreno/a4xx/fd4_gmem.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_program.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_query.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_rasterizer.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_screen.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_texture.c | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_texture.h | 2 +- src/gallium/drivers/freedreno/a4xx/fd4_zsa.c | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename src/gallium/drivers/freedreno/a4xx/{fd4_util.c => fd4_format.c} (99%) rename src/gallium/drivers/freedreno/a4xx/{fd4_util.h => fd4_format.h} (100%) diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources index 81019dbfbfa..4f7a0531142 100644 --- a/src/gallium/drivers/freedreno/Makefile.sources +++ b/src/gallium/drivers/freedreno/Makefile.sources @@ -99,6 +99,8 @@ a4xx_SOURCES := \ a4xx/fd4_draw.h \ a4xx/fd4_emit.c \ a4xx/fd4_emit.h \ + a4xx/fd4_format.c \ + a4xx/fd4_format.h \ a4xx/fd4_gmem.c \ a4xx/fd4_gmem.h \ a4xx/fd4_program.c \ @@ -111,8 +113,6 @@ a4xx_SOURCES := \ a4xx/fd4_screen.h \ a4xx/fd4_texture.c \ a4xx/fd4_texture.h \ - a4xx/fd4_util.c \ - a4xx/fd4_util.h \ a4xx/fd4_zsa.c \ a4xx/fd4_zsa.h diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_blend.c b/src/gallium/drivers/freedreno/a4xx/fd4_blend.c index bf2254a8ae0..b2d494930c4 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_blend.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_blend.c @@ -32,7 +32,7 @@ #include "fd4_blend.h" #include "fd4_context.h" -#include "fd4_util.h" +#include "fd4_format.h" static enum a4xx_rb_blend_opcode blend_func(unsigned func) diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_draw.c b/src/gallium/drivers/freedreno/a4xx/fd4_draw.c index 9a586c8806b..aa3df9fc57b 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_draw.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_draw.c @@ -38,7 +38,7 @@ #include "fd4_context.h" #include "fd4_emit.h" #include "fd4_program.h" -#include "fd4_util.h" +#include "fd4_format.h" #include "fd4_zsa.h" diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c index a1f53cfb89e..c7be161a073 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c @@ -40,7 +40,7 @@ #include "fd4_program.h" #include "fd4_rasterizer.h" #include "fd4_texture.h" -#include "fd4_util.h" +#include "fd4_format.h" #include "fd4_zsa.h" /* regid: base const register diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.h b/src/gallium/drivers/freedreno/a4xx/fd4_emit.h index d133f011e98..cdfa0f4c53a 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.h +++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.h @@ -32,7 +32,7 @@ #include "pipe/p_context.h" #include "freedreno_context.h" -#include "fd4_util.h" +#include "fd4_format.h" #include "fd4_program.h" #include "ir3_shader.h" diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_util.c b/src/gallium/drivers/freedreno/a4xx/fd4_format.c similarity index 99% rename from src/gallium/drivers/freedreno/a4xx/fd4_util.c rename to src/gallium/drivers/freedreno/a4xx/fd4_format.c index 2dd0e7f278a..6b99a74919c 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_util.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_format.c @@ -29,7 +29,7 @@ #include "pipe/p_defines.h" #include "util/u_format.h" -#include "fd4_util.h" +#include "fd4_format.h" /* convert pipe format to vertex buffer format: */ enum a4xx_vtx_fmt diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_util.h b/src/gallium/drivers/freedreno/a4xx/fd4_format.h similarity index 100% rename from src/gallium/drivers/freedreno/a4xx/fd4_util.h rename to src/gallium/drivers/freedreno/a4xx/fd4_format.h diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c index ce0a8c14d34..89ae260c855 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c @@ -41,7 +41,7 @@ #include "fd4_draw.h" #include "fd4_emit.h" #include "fd4_program.h" -#include "fd4_util.h" +#include "fd4_format.h" #include "fd4_zsa.h" static const struct ir3_shader_key key = { diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_program.c b/src/gallium/drivers/freedreno/a4xx/fd4_program.c index 65182801895..e085d88f0c1 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_program.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_program.c @@ -39,7 +39,7 @@ #include "fd4_program.h" #include "fd4_emit.h" #include "fd4_texture.h" -#include "fd4_util.h" +#include "fd4_format.h" static void delete_shader_stateobj(struct fd4_shader_stateobj *so) diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_query.c b/src/gallium/drivers/freedreno/a4xx/fd4_query.c index 9a50626aaeb..6db1c11b94b 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_query.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_query.c @@ -31,7 +31,7 @@ #include "freedreno_util.h" #include "fd4_query.h" -#include "fd4_util.h" +#include "fd4_format.h" void fd4_query_context_init(struct pipe_context *pctx) { diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_rasterizer.c b/src/gallium/drivers/freedreno/a4xx/fd4_rasterizer.c index b363cb79a28..e54b606a285 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_rasterizer.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_rasterizer.c @@ -33,7 +33,7 @@ #include "fd4_rasterizer.h" #include "fd4_context.h" -#include "fd4_util.h" +#include "fd4_format.h" void * fd4_rasterizer_state_create(struct pipe_context *pctx, diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_screen.c b/src/gallium/drivers/freedreno/a4xx/fd4_screen.c index df5ac6e6cad..cf697d4b741 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_screen.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_screen.c @@ -31,7 +31,7 @@ #include "fd4_screen.h" #include "fd4_context.h" -#include "fd4_util.h" +#include "fd4_format.h" static boolean fd4_screen_is_format_supported(struct pipe_screen *pscreen, diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c index 6523c71e4c1..2b826d6325d 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_texture.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_texture.c @@ -33,7 +33,7 @@ #include "util/u_format.h" #include "fd4_texture.h" -#include "fd4_util.h" +#include "fd4_format.h" /* TODO do we need to emulate clamp-to-edge like a3xx? */ static enum a4xx_tex_clamp diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_texture.h b/src/gallium/drivers/freedreno/a4xx/fd4_texture.h index 3592b1049b1..07eb961eb8f 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_texture.h +++ b/src/gallium/drivers/freedreno/a4xx/fd4_texture.h @@ -35,7 +35,7 @@ #include "freedreno_resource.h" #include "fd4_context.h" -#include "fd4_util.h" +#include "fd4_format.h" struct fd4_sampler_stateobj { struct pipe_sampler_state base; diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_zsa.c b/src/gallium/drivers/freedreno/a4xx/fd4_zsa.c index 59942dceb9e..da0c2b748fe 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_zsa.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_zsa.c @@ -33,7 +33,7 @@ #include "fd4_zsa.h" #include "fd4_context.h" -#include "fd4_util.h" +#include "fd4_format.h" void * fd4_zsa_state_create(struct pipe_context *pctx, -- 2.30.2