Mesa (master): freedreno/a4xx: fd4_util -> fd4_format
Rob Clark
robclark at kemper.freedesktop.org
Thu Dec 4 21:02:01 UTC 2014
Module: Mesa
Branch: master
Commit: e9589a8fcf60f9d04ea31e6f84f43f9d10a636da
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9589a8fcf60f9d04ea31e6f84f43f9d10a636da
Author: Rob Clark <robclark at freedesktop.org>
Date: Wed Dec 3 18:02:38 2014 -0500
freedreno/a4xx: fd4_util -> fd4_format
Signed-off-by: Rob Clark <robclark at freedesktop.org>
---
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 +-
src/gallium/drivers/freedreno/a4xx/{fd4_util.c => fd4_format.c} | 2 +-
src/gallium/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(-)
diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources
index 81019db..4f7a053 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 bf2254a..b2d4949 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 9a586c8..aa3df9f 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 a1f53cf..c7be161 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 d133f01..cdfa0f4 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 2dd0e7f..6b99a74 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 ce0a8c1..89ae260 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 6518280..e085d88 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 9a50626..6db1c11 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 b363cb7..e54b606 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 df5ac6e..cf697d4 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 6523c71..2b826d6 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 3592b10..07eb961 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 59942dc..da0c2b7 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,
More information about the mesa-commit
mailing list