diff options
15 files changed, 18 insertions, 22 deletions
diff --git a/src/gallium/drivers/freedreno/Makefile.sources b/src/gallium/drivers/freedreno/Makefile.sources index 19bb8f9cd24..81019dbfbfa 100644 --- a/src/gallium/drivers/freedreno/Makefile.sources +++ b/src/gallium/drivers/freedreno/Makefile.sources @@ -72,6 +72,8 @@ a3xx_SOURCES := \ a3xx/fd3_draw.h \ a3xx/fd3_emit.c \ a3xx/fd3_emit.h \ + a3xx/fd3_format.c \ + a3xx/fd3_format.h \ a3xx/fd3_gmem.c \ a3xx/fd3_gmem.h \ a3xx/fd3_program.c \ @@ -84,8 +86,6 @@ a3xx_SOURCES := \ a3xx/fd3_screen.h \ a3xx/fd3_texture.c \ a3xx/fd3_texture.h \ - a3xx/fd3_util.c \ - a3xx/fd3_util.h \ a3xx/fd3_zsa.c \ a3xx/fd3_zsa.h diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_blend.c b/src/gallium/drivers/freedreno/a3xx/fd3_blend.c index 940d065d75b..329d304694c 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_blend.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_blend.c @@ -32,7 +32,7 @@ #include "fd3_blend.h" #include "fd3_context.h" -#include "fd3_util.h" +#include "fd3_format.h" static enum a3xx_rb_blend_opcode diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c index b289e76fa24..b824d212a36 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_draw.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_draw.c @@ -39,7 +39,7 @@ #include "fd3_context.h" #include "fd3_emit.h" #include "fd3_program.h" -#include "fd3_util.h" +#include "fd3_format.h" #include "fd3_zsa.h" diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c index 62ffa73cd20..64b1c32bb63 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.c @@ -40,7 +40,7 @@ #include "fd3_program.h" #include "fd3_rasterizer.h" #include "fd3_texture.h" -#include "fd3_util.h" +#include "fd3_format.h" #include "fd3_zsa.h" /* regid: base const register diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h index a397c8705a3..c1bd61ae0a8 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h +++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h @@ -32,7 +32,7 @@ #include "pipe/p_context.h" #include "freedreno_context.h" -#include "fd3_util.h" +#include "fd3_format.h" #include "fd3_program.h" #include "ir3_shader.h" diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c index a73894f49fc..a70acebd626 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_util.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c @@ -29,7 +29,7 @@ #include "pipe/p_defines.h" #include "util/u_format.h" -#include "fd3_util.h" +#include "fd3_format.h" /* convert pipe format to vertex buffer format: */ enum a3xx_vtx_fmt diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_util.h b/src/gallium/drivers/freedreno/a3xx/fd3_format.h index 4681840b173..ebd67959c7b 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_util.h +++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.h @@ -1,5 +1,3 @@ -/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */ - /* * Copyright (C) 2013 Rob Clark <[email protected]> * @@ -22,12 +20,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. * - * Authors: - * Rob Clark <[email protected]> */ -#ifndef FD3_UTIL_H_ -#define FD3_UTIL_H_ +#ifndef FD3_FORMAT_H_ +#define FD3_FORMAT_H_ #include "freedreno_util.h" @@ -43,4 +39,4 @@ enum a3xx_color_swap fd3_pipe2swap(enum pipe_format format); uint32_t fd3_tex_swiz(enum pipe_format format, unsigned swizzle_r, unsigned swizzle_g, unsigned swizzle_b, unsigned swizzle_a); -#endif /* FD3_UTIL_H_ */ +#endif /* FD3_FORMAT_H_ */ diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c index f454db28a5e..1dd43cc6b4c 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_gmem.c @@ -40,7 +40,7 @@ #include "fd3_context.h" #include "fd3_emit.h" #include "fd3_program.h" -#include "fd3_util.h" +#include "fd3_format.h" #include "fd3_zsa.h" static const struct ir3_shader_key key = { diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_program.c b/src/gallium/drivers/freedreno/a3xx/fd3_program.c index cb0179a68d3..b6710957458 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_program.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_program.c @@ -39,7 +39,7 @@ #include "fd3_program.h" #include "fd3_emit.h" #include "fd3_texture.h" -#include "fd3_util.h" +#include "fd3_format.h" static void delete_shader_stateobj(struct fd3_shader_stateobj *so) diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_query.c b/src/gallium/drivers/freedreno/a3xx/fd3_query.c index bc3a3ec69c7..cf70ae3bd3c 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_query.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_query.c @@ -31,7 +31,7 @@ #include "freedreno_util.h" #include "fd3_query.h" -#include "fd3_util.h" +#include "fd3_format.h" struct fd_rb_samp_ctrs { diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c b/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c index 1a1a7cbd653..4b926b50f44 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_rasterizer.c @@ -33,7 +33,7 @@ #include "fd3_rasterizer.h" #include "fd3_context.h" -#include "fd3_util.h" +#include "fd3_format.h" void * fd3_rasterizer_state_create(struct pipe_context *pctx, diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_screen.c b/src/gallium/drivers/freedreno/a3xx/fd3_screen.c index 9bb19abc2a8..38716605079 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_screen.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_screen.c @@ -31,7 +31,7 @@ #include "fd3_screen.h" #include "fd3_context.h" -#include "fd3_util.h" +#include "fd3_format.h" static boolean fd3_screen_is_format_supported(struct pipe_screen *pscreen, diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c index 39befef7672..5dda82de148 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.c @@ -33,7 +33,7 @@ #include "util/u_format.h" #include "fd3_texture.h" -#include "fd3_util.h" +#include "fd3_format.h" static enum a3xx_tex_clamp tex_clamp(unsigned wrap, bool clamp_to_edge) diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h index 0434df37413..f3cb12022f0 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_texture.h +++ b/src/gallium/drivers/freedreno/a3xx/fd3_texture.h @@ -35,7 +35,7 @@ #include "freedreno_resource.h" #include "fd3_context.h" -#include "fd3_util.h" +#include "fd3_format.h" struct fd3_sampler_stateobj { struct pipe_sampler_state base; diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c b/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c index c97cfb73695..39471261c89 100644 --- a/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c +++ b/src/gallium/drivers/freedreno/a3xx/fd3_zsa.c @@ -33,7 +33,7 @@ #include "fd3_zsa.h" #include "fd3_context.h" -#include "fd3_util.h" +#include "fd3_format.h" void * fd3_zsa_state_create(struct pipe_context *pctx, |