util: Move gallium's PIPE_FORMAT utils to /util/format/

To make PIPE_FORMATs usable from non-gallium parts of Mesa, I want to
move their helpers out of gallium.  Since u_format used
util_copy_rect(), I moved that in there, too.

I've put it in a separate directory in util/ because it's a big chunk
of related code, and it's not clear to me whether we might want it as
a separate library from libmesa_util at some point.

Closes: #1905
Acked-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>

src/broadcom/compiler/nir_to_vir.c

@@ -22,7 +22,7 @@
  */
 
 #include <inttypes.h>
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/ralloc.h"

src/broadcom/compiler/v3d_nir_lower_logic_ops.c

@@ -30,7 +30,7 @@
  * appropriately.
  */
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "compiler/nir/nir_builder.h"
 #include "compiler/nir/nir_format_convert.h"
 #include "v3d_compiler.h"

src/freedreno/ir3/ir3_shader.c

@@ -27,7 +27,7 @@
 #include "util/u_atomic.h"
 #include "util/u_string.h"
 #include "util/u_memory.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "drm/freedreno_drmif.h"
 

src/gallium/auxiliary/Android.mk

@@ -70,9 +70,6 @@ $(intermediates)/indices/u_unfilled_gen.c \
 $(intermediates)/util/u_format_srgb.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py
 	$(transform-generated-source)
 
-$(intermediates)/util/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/util/u_format.csv
-	$(transform-generated-source)
-
 LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H)
 
 include $(GALLIUM_COMMON_MK)

src/gallium/auxiliary/Makefile.sources

@@ -244,26 +244,6 @@ C_SOURCES := \
 	util/u_dump.h \
 	util/u_dump_state.c \
 	util/u_fifo.h \
-	util/u_format.c \
-	util/u_format.h \
-	util/u_format_bptc.c \
-	util/u_format_bptc.h \
-	util/u_format_etc.c \
-	util/u_format_etc.h \
-	util/u_format_latc.c \
-	util/u_format_latc.h \
-	util/u_format_other.c \
-	util/u_format_other.h \
-	util/u_format_rgtc.c \
-	util/u_format_rgtc.h \
-	util/u_format_s3tc.c \
-	util/u_format_s3tc.h \
-	util/u_format_tests.c \
-	util/u_format_tests.h \
-	util/u_format_yuv.c \
-	util/u_format_yuv.h \
-	util/u_format_zs.c \
-	util/u_format_zs.h \
 	util/u_framebuffer.c \
 	util/u_framebuffer.h \
 	util/u_gen_mipmap.c \
@@ -396,8 +376,7 @@ VL_STUB_SOURCES := \
 
 GENERATED_SOURCES := \
 	indices/u_indices_gen.c \
-	indices/u_unfilled_gen.c \
-	util/u_format_table.c
+	indices/u_unfilled_gen.c
 
 GALLIVM_SOURCES := \
 	gallivm/lp_bld_arit.c \

src/gallium/auxiliary/SConscript

@@ -26,18 +26,6 @@ env.CodeGenerate(
     command = python_cmd + ' $SCRIPT > $TARGET'
 )
 
-env.CodeGenerate(
-    target = 'util/u_format_table.c',
-    script = '#src/gallium/auxiliary/util/u_format_table.py',
-    source = ['#src/gallium/auxiliary/util/u_format.csv'],
-    command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
-)
-
-env.Depends('util/u_format_table.c', [
-    '#src/gallium/auxiliary/util/u_format_parse.py',
-    'util/u_format_pack.py',
-])
-
 source = env.ParseSourceList('Makefile.sources', [
     'C_SOURCES',
     'VL_STUB_SOURCES',

src/gallium/auxiliary/draw/draw_context.c

@@ -38,7 +38,7 @@
 #include "util/u_inlines.h"
 #include "util/u_helpers.h"
 #include "util/u_prim.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "draw_context.h"
 #include "draw_pipe.h"
 #include "draw_prim_assembler.h"

src/gallium/auxiliary/draw/draw_pipe_aaline.c

@@ -37,7 +37,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "util/u_inlines.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 

src/gallium/auxiliary/draw/draw_pipe_offset.c

@@ -32,7 +32,7 @@
  * \author  Brian Paul
  */
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "draw_pipe.h"

src/gallium/auxiliary/draw/draw_pipe_pstipple.c

@@ -40,7 +40,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "util/u_inlines.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_pstipple.h"

src/gallium/auxiliary/draw/draw_pt.c

@@ -39,7 +39,7 @@
 #include "tgsi/tgsi_dump.h"
 #include "util/u_math.h"
 #include "util/u_prim.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_draw.h"
 
 

src/gallium/auxiliary/draw/draw_pt_fetch.c

@@ -27,7 +27,7 @@
 
 #include "util/u_memory.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "draw/draw_context.h"
 #include "draw/draw_private.h"
 #include "draw/draw_pt.h"

src/gallium/auxiliary/driver_ddebug/dd_draw.c

@@ -28,7 +28,7 @@
 #include "dd_pipe.h"
 
 #include "util/u_dump.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_framebuffer.h"
 #include "util/u_helpers.h"
 #include "util/u_inlines.h"

src/gallium/auxiliary/driver_noop/noop_pipe.c

@@ -28,7 +28,7 @@
 #include "pipe/p_screen.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_upload_mgr.h"
 #include "noop_public.h"
 

src/gallium/auxiliary/driver_rbug/rbug_core.c

@@ -27,7 +27,7 @@
 
 
 #include "os/os_thread.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_string.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"

src/gallium/auxiliary/driver_trace/tr_dump.c

@@ -50,7 +50,7 @@
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "tr_dump.h"
 #include "tr_screen.h"

src/gallium/auxiliary/driver_trace/tr_dump_defines.h

@@ -29,7 +29,7 @@
 #define TR_DUMP_DEFINES_H_
 
 #include "pipe/p_compiler.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_dump.h"
 #include "tr_dump.h"
 

src/gallium/auxiliary/driver_trace/tr_dump_state.c

@@ -28,7 +28,7 @@
 
 #include "pipe/p_compiler.h"
 #include "util/u_memory.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"
 
 #include "tr_dump.h"

src/gallium/auxiliary/driver_trace/tr_screen.c

@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/simple_list.h"
 

src/gallium/auxiliary/gallivm/lp_bld_format_aos.c

@@ -33,7 +33,7 @@
  */
 
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
 #include "util/u_pointer.h"

src/gallium/auxiliary/gallivm/lp_bld_format_aos_array.c

@@ -36,7 +36,7 @@
 #include "lp_bld_gather.h"
 
 #include "util/u_memory.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "pipe/p_state.h"
 
 

src/gallium/auxiliary/gallivm/lp_bld_format_s3tc.c

@@ -36,7 +36,7 @@
 
 #include <llvm/Config/llvm-config.h>
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_string.h"
 #include "util/u_cpu_detect.h"

src/gallium/auxiliary/gallivm/lp_bld_format_soa.c

@@ -28,7 +28,7 @@
 
 #include "pipe/p_defines.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
 #include "util/u_math.h"

src/gallium/auxiliary/gallivm/lp_bld_format_yuv.c

@@ -34,7 +34,7 @@
  */
 
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_cpu_detect.h"
 
 #include "lp_bld_arit.h"

src/gallium/auxiliary/gallivm/lp_bld_sample.c

@@ -34,7 +34,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_cpu_detect.h"
 #include "lp_bld_arit.h"

src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c

@@ -39,7 +39,7 @@
 #include "util/u_dump.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_cpu_detect.h"
 #include "lp_bld_debug.h"
 #include "lp_bld_type.h"

src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c

@@ -40,7 +40,7 @@
 #include "util/u_dump.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_cpu_detect.h"
 #include "util/format_rgb9e5.h"
 #include "lp_bld_debug.h"

src/gallium/auxiliary/gallivm/lp_bld_type.h

@@ -37,7 +37,7 @@
 #define LP_BLD_TYPE_H
 
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "pipe/p_compiler.h"
 #include "gallivm/lp_bld.h"
 

src/gallium/auxiliary/hud/hud_context.c

@@ -42,7 +42,7 @@
 
 #include "cso_cache/cso_context.h"
 #include "util/u_draw_quad.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"

src/gallium/auxiliary/meson.build

@@ -264,26 +264,6 @@ files_libgallium = files(
   'util/u_dump.h',
   'util/u_dump_state.c',
   'util/u_fifo.h',
-  'util/u_format.c',
-  'util/u_format.h',
-  'util/u_format_bptc.c',
-  'util/u_format_bptc.h',
-  'util/u_format_etc.c',
-  'util/u_format_etc.h',
-  'util/u_format_latc.c',
-  'util/u_format_latc.h',
-  'util/u_format_other.c',
-  'util/u_format_other.h',
-  'util/u_format_rgtc.c',
-  'util/u_format_rgtc.h',
-  'util/u_format_s3tc.c',
-  'util/u_format_s3tc.h',
-  'util/u_format_tests.c',
-  'util/u_format_tests.h',
-  'util/u_format_yuv.c',
-  'util/u_format_yuv.h',
-  'util/u_format_zs.c',
-  'util/u_format_zs.h',
   'util/u_framebuffer.c',
   'util/u_framebuffer.h',
   'util/u_gen_mipmap.c',
@@ -508,18 +488,9 @@ u_unfilled_gen_c = custom_target(
   capture : true,
 )
 
-u_format_table_c = custom_target(
-  'u_format_table.c',
-  input : ['util/u_format_table.py', 'util/u_format.csv'],
-  output : 'u_format_table.c',
-  command : [prog_python, '@INPUT@'],
-  depend_files : files('util/u_format_pack.py', 'util/u_format_parse.py'),
-  capture : true,
-)
-
 libgallium = static_library(
   'gallium',
-  [files_libgallium, u_indices_gen_c, u_unfilled_gen_c, u_format_table_c],
+  [files_libgallium, u_indices_gen_c, u_unfilled_gen_c],
   include_directories : [
     inc_loader, inc_gallium, inc_src, inc_include, include_directories('util')
   ],

src/gallium/auxiliary/renderonly/renderonly.c

@@ -33,7 +33,7 @@
 
 #include "state_tracker/drm_driver.h"
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 

src/gallium/auxiliary/tgsi/tgsi_info.h

@@ -30,7 +30,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_shader_tokens.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #if defined __cplusplus
 extern "C" {

src/gallium/auxiliary/translate/translate_generic.c

@@ -31,7 +31,7 @@
   */
 
 #include "util/u_memory.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_half.h"
 #include "util/u_math.h"
 #include "pipe/p_state.h"

src/gallium/auxiliary/translate/translate_sse.c

@@ -30,7 +30,7 @@
 #include "pipe/p_compiler.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "translate.h"
 

src/gallium/auxiliary/util/u_blit.c

@@ -42,7 +42,7 @@
 
 #include "util/u_blit.h"
 #include "util/u_draw_quad.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_sampler.h"

src/gallium/auxiliary/util/u_blitter.c

@@ -38,7 +38,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_state.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
 #include "util/u_blitter.h"

src/gallium/auxiliary/util/u_compute.c

@@ -30,7 +30,7 @@
 #include "pipe/p_state.h"
 
 #include "u_bitcast.h"
-#include "u_format.h"
+#include "util/format/u_format.h"
 #include "u_sampler.h"
 #include "tgsi/tgsi_text.h"
 #include "tgsi/tgsi_ureg.h"

src/gallium/auxiliary/util/u_debug_describe.c

@@ -25,7 +25,7 @@
  **************************************************************************/
 
 #include "pipe/p_state.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_debug_describe.h"
 #include "util/u_string.h"
 

src/gallium/auxiliary/util/u_debug_gallium.c

@@ -30,7 +30,7 @@
 #include "util/u_debug.h"
 #include "u_debug_gallium.h"
 #include "u_dump.h"
-#include "u_format.h"
+#include "util/format/u_format.h"
 
 #ifdef DEBUG
 

src/gallium/auxiliary/util/u_debug_image.c

@@ -25,7 +25,7 @@
 
 
 #include "util/u_debug_image.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"

src/gallium/auxiliary/util/u_draw.c

@@ -29,7 +29,7 @@
 #include "util/u_debug.h"
 #include "util/u_inlines.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_draw.h"
 
 

src/gallium/auxiliary/util/u_dump_state.c

@@ -29,7 +29,7 @@
 #include "pipe/p_compiler.h"
 #include "util/u_memory.h"
 #include "util/u_string.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"
 
 #include <inttypes.h>

src/gallium/auxiliary/util/u_gen_mipmap.c

@@ -36,7 +36,7 @@
 
 
 #include "util/u_gen_mipmap.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 
 

src/gallium/auxiliary/util/u_pack_color.h

@@ -38,7 +38,7 @@
 #include "pipe/p_compiler.h"
 #include "pipe/p_format.h"
 #include "util/u_debug_gallium.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 
 

src/gallium/auxiliary/util/u_pstipple.c

@@ -45,7 +45,7 @@
 #include "pipe/p_shader_tokens.h"
 #include "util/u_inlines.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_memory.h"
 #include "util/u_pstipple.h"
 #include "util/u_sampler.h"

src/gallium/auxiliary/util/u_resource.c

@@ -26,7 +26,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_resource.h"
 

src/gallium/auxiliary/util/u_sampler.c

@@ -26,7 +26,7 @@
  **************************************************************************/
 
 
-#include "u_format.h"
+#include "util/format/u_format.h"
 #include "u_sampler.h"
 
 

src/gallium/auxiliary/util/u_surface.c

@@ -36,7 +36,7 @@
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_rect.h"
 #include "util/u_surface.h"
@@ -57,59 +57,6 @@ u_surface_default_template(struct pipe_surface *surf,
 }
 
 
-/**
- * Copy 2D rect from one place to another.
- * Position and sizes are in pixels.
- * src_stride may be negative to do vertical flip of pixels from source.
- */
-void
-util_copy_rect(ubyte * dst,
-               enum pipe_format format,
-               unsigned dst_stride,
-               unsigned dst_x,
-               unsigned dst_y,
-               unsigned width,
-               unsigned height,
-               const ubyte * src,
-               int src_stride,
-               unsigned src_x,
-               unsigned src_y)
-{
-   unsigned i;
-   int src_stride_pos = src_stride < 0 ? -src_stride : src_stride;
-   int blocksize = util_format_get_blocksize(format);
-   int blockwidth = util_format_get_blockwidth(format);
-   int blockheight = util_format_get_blockheight(format);
-
-   assert(blocksize > 0);
-   assert(blockwidth > 0);
-   assert(blockheight > 0);
-
-   dst_x /= blockwidth;
-   dst_y /= blockheight;
-   width = (width + blockwidth - 1)/blockwidth;
-   height = (height + blockheight - 1)/blockheight;
-   src_x /= blockwidth;
-   src_y /= blockheight;
-
-   dst += dst_x * blocksize;
-   src += src_x * blocksize;
-   dst += dst_y * dst_stride;
-   src += src_y * src_stride_pos;
-   width *= blocksize;
-
-   if (width == dst_stride && width == (unsigned)src_stride)
-      memcpy(dst, src, height * width);
-   else {
-      for (i = 0; i < height; i++) {
-         memcpy(dst, src, width);
-         dst += dst_stride;
-         src += src_stride;
-      }
-   }
-}
-
-
 /**
  * Copy 3D box from one place to another.
  * Position and sizes are in pixels.

src/gallium/auxiliary/util/u_surface.h

@@ -44,12 +44,6 @@ extern void
 u_surface_default_template(struct pipe_surface *view,
                            const struct pipe_resource *texture);
 
-extern void
-util_copy_rect(ubyte * dst, enum pipe_format format,
-               unsigned dst_stride, unsigned dst_x, unsigned dst_y,
-               unsigned width, unsigned height, const ubyte * src,
-               int src_stride, unsigned src_x, unsigned src_y);
-
 extern void
 util_copy_box(ubyte * dst,
               enum pipe_format format,

src/gallium/auxiliary/util/u_tests.c

@@ -28,7 +28,7 @@
 #include "util/u_tests.h"
 
 #include "util/u_draw_quad.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_simple_shaders.h"

src/gallium/auxiliary/util/u_threaded_context.c

@@ -26,7 +26,7 @@
 
 #include "util/u_threaded_context.h"
 #include "util/u_cpu_detect.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"

src/gallium/auxiliary/util/u_tile.c

@@ -34,8 +34,8 @@
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
 
-#include "util/u_format.h"
-#include "util/u_format_bptc.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_bptc.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_surface.h"

src/gallium/auxiliary/util/u_transfer_helper.c

@@ -24,9 +24,9 @@
 #include "pipe/p_screen.h"
 
 #include "util/u_box.h"
-#include "util/u_format.h"
-#include "util/u_format_rgtc.h"
-#include "util/u_format_zs.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_rgtc.h"
+#include "util/format/u_format_zs.h"
 #include "util/u_inlines.h"
 #include "util/u_transfer_helper.h"
 

src/gallium/auxiliary/util/u_vbuf.c

@@ -88,7 +88,7 @@
 #include "util/u_vbuf.h"
 
 #include "util/u_dump.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"

src/gallium/auxiliary/vl/vl_deint_filter.c

@@ -47,7 +47,7 @@
 #include "util/u_draw.h"
 #include "util/u_memory.h"
 #include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "vl_types.h"
 #include "vl_video_buffer.h"

src/gallium/auxiliary/vl/vl_vertex_buffers.c

@@ -26,7 +26,7 @@
  **************************************************************************/
 
 #include <assert.h>
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "vl_vertex_buffers.h"
 #include "vl_types.h"
 

src/gallium/auxiliary/vl/vl_video_buffer.c

@@ -31,7 +31,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_sampler.h"
 #include "util/u_memory.h"

src/gallium/drivers/etnaviv/etnaviv_etc2.c

@@ -29,7 +29,7 @@
 #include "etnaviv_resource.h"
 #include "etnaviv_screen.h"
 #include "hw/common.xml.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 bool
 etna_etc2_needs_patching(const struct pipe_resource *prsc)

src/gallium/drivers/etnaviv/etnaviv_format.h

@@ -27,7 +27,7 @@
 #ifndef ETNAVIV_FORMAT_H_
 #define ETNAVIV_FORMAT_H_
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include <stdint.h>
 
 #define ETNA_NO_MATCH (~0)

src/gallium/drivers/etnaviv/etnaviv_transfer.c

@@ -35,7 +35,7 @@
 #include "pipe/p_format.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_surface.h"

src/gallium/drivers/etnaviv/etnaviv_translate.h

@@ -36,7 +36,7 @@
 #include "hw/state.xml.h"
 #include "hw/state_3d.xml.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 
 /* Returned when there is no match of pipe value to etna value */

src/gallium/drivers/freedreno/a2xx/fd2_program.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"
 #include "tgsi/tgsi_parse.h"
 #include "nir/tgsi_to_nir.h"

src/gallium/drivers/freedreno/a2xx/fd2_screen.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd2_screen.h"
 #include "fd2_context.h"

src/gallium/drivers/freedreno/a2xx/fd2_util.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd2_util.h"
 

src/gallium/drivers/freedreno/a3xx/fd3_draw.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_prim.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_state.h"
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a3xx/fd3_emit.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_helpers.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_viewport.h"
 
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a3xx/fd3_format.c

@@ -23,7 +23,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd3_format.h"
 

src/gallium/drivers/freedreno/a3xx/fd3_format.h

@@ -25,7 +25,7 @@
 #ifndef FD3_FORMAT_H_
 #define FD3_FORMAT_H_
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "freedreno_util.h"
 
 #include "a3xx.xml.h"

src/gallium/drivers/freedreno/a3xx/fd3_gmem.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_draw.h"
 #include "freedreno_state.h"

src/gallium/drivers/freedreno/a3xx/fd3_program.c

@@ -29,7 +29,7 @@
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_program.h"
 

src/gallium/drivers/freedreno/a3xx/fd3_screen.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd3_screen.h"
 #include "fd3_context.h"

src/gallium/drivers/freedreno/a3xx/fd3_texture.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd3_texture.h"
 #include "fd3_format.h"

src/gallium/drivers/freedreno/a4xx/fd4_emit.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_helpers.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_viewport.h"
 
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a4xx/fd4_format.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd4_format.h"
 

src/gallium/drivers/freedreno/a4xx/fd4_gmem.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_draw.h"
 #include "freedreno_state.h"

src/gallium/drivers/freedreno/a4xx/fd4_program.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_program.h"
 

src/gallium/drivers/freedreno/a4xx/fd4_screen.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd4_screen.h"
 #include "fd4_context.h"

src/gallium/drivers/freedreno/a4xx/fd4_texture.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd4_texture.h"
 #include "fd4_format.h"

src/gallium/drivers/freedreno/a5xx/fd5_emit.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_helpers.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_viewport.h"
 
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a5xx/fd5_format.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd5_format.h"
 

src/gallium/drivers/freedreno/a5xx/fd5_gmem.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_draw.h"
 #include "freedreno_state.h"

src/gallium/drivers/freedreno/a5xx/fd5_program.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/bitset.h"
 
 #include "freedreno_program.h"

src/gallium/drivers/freedreno/a5xx/fd5_screen.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd5_screen.h"
 #include "fd5_blitter.h"

src/gallium/drivers/freedreno/a5xx/fd5_texture.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd5_texture.h"
 #include "fd5_format.h"

src/gallium/drivers/freedreno/a6xx/fd6_emit.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_helpers.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_viewport.h"
 
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a6xx/fd6_format.c

@@ -26,7 +26,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd6_format.h"
 #include "freedreno_resource.h"

src/gallium/drivers/freedreno/a6xx/fd6_gmem.c

@@ -31,7 +31,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_draw.h"
 #include "freedreno_state.h"

src/gallium/drivers/freedreno/a6xx/fd6_program.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/bitset.h"
 
 #include "freedreno_program.h"

src/gallium/drivers/freedreno/a6xx/fd6_screen.c

@@ -27,7 +27,7 @@
 
 #include "drm-uapi/drm_fourcc.h"
 #include "pipe/p_screen.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "fd6_screen.h"
 #include "fd6_blitter.h"

src/gallium/drivers/freedreno/a6xx/fd6_texture.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/hash_table.h"
 
 #include "fd6_texture.h"

src/gallium/drivers/freedreno/freedreno_draw.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_prim.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_helpers.h"
 
 #include "freedreno_blitter.h"

src/gallium/drivers/freedreno/freedreno_gmem.c

@@ -28,7 +28,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_gmem.h"
 #include "freedreno_context.h"

src/gallium/drivers/freedreno/freedreno_resource.c

@@ -24,9 +24,9 @@
  *    Rob Clark <robclark@freedesktop.org>
  */
 
-#include "util/u_format.h"
-#include "util/u_format_rgtc.h"
-#include "util/u_format_zs.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_rgtc.h"
+#include "util/format/u_format_zs.h"
 #include "util/u_inlines.h"
 #include "util/u_transfer.h"
 #include "util/u_string.h"

src/gallium/drivers/freedreno/freedreno_screen.c

@@ -31,8 +31,8 @@
 
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
-#include "util/u_format_s3tc.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_s3tc.h"
 #include "util/u_screen.h"
 #include "util/u_string.h"
 #include "util/u_debug.h"

src/gallium/drivers/freedreno/freedreno_util.c

@@ -25,7 +25,7 @@
  */
 
 #include "pipe/p_defines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 #include "freedreno_util.h"
 

src/gallium/drivers/freedreno/ir3/ir3_gallium.c

@@ -29,7 +29,7 @@
 #include "util/u_string.h"
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "tgsi/tgsi_dump.h"
 #include "tgsi/tgsi_parse.h"
 

src/gallium/drivers/i915/i915_clear.c

@@ -30,7 +30,7 @@
  */
 
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_pack_color.h"
 #include "i915_context.h"
 #include "i915_screen.h"

src/gallium/drivers/i915/i915_resource_texture.c

@@ -34,7 +34,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"
 #include "util/u_rect.h"

src/gallium/drivers/i915/i915_screen.c

@@ -28,8 +28,8 @@
 
 #include "draw/draw_context.h"
 #include "util/os_misc.h"
-#include "util/u_format.h"
-#include "util/u_format_s3tc.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_s3tc.h"
 #include "util/u_inlines.h"
 #include "util/u_memory.h"
 #include "util/u_screen.h"

src/gallium/drivers/i915/i915_state_emit.c

@@ -37,7 +37,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_format.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 #include "util/u_math.h"
 #include "util/u_memory.h"