util: Move src/gallium/include/pipe/p_format.h to src/util/format/u_formats.h

Because p_format.h shared between vulkan drivers and opengl drivers

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19629>

diff --git a/src/amd/common/gfx10_format_table.h b/src/amd/common/gfx10_format_table.h
index 4da6c34..14881cf 100644 (file)
--- a/src/amd/common/gfx10_format_table.h
+++ b/src/amd/common/gfx10_format_table.h
@@ -27,7 +27,7 @@
 #ifndef GFX10_FORMAT_TABLE_H
 #define GFX10_FORMAT_TABLE_H
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "ac_gpu_info.h"
 
 #include <stdbool.h>

diff --git a/src/compiler/nir/nir_lower_blend.h b/src/compiler/nir/nir_lower_blend.h
index 24510c8..50a46ce 100644 (file)
--- a/src/compiler/nir/nir_lower_blend.h
+++ b/src/compiler/nir/nir_lower_blend.h
@@ -26,7 +26,7 @@
 #define NIR_BLEND_H
 
 #include "compiler/nir/nir.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 /* These structs encapsulates the blend state such that it can be lowered
  * cleanly

diff --git a/src/gallium/auxiliary/driver_trace/tr_context.c b/src/gallium/auxiliary/driver_trace/tr_context.c
index e404a17..b762215 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_context.c
+++ b/src/gallium/auxiliary/driver_trace/tr_context.c
@@ -30,7 +30,7 @@
 #include "util/u_memory.h"
 #include "util/u_framebuffer.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 
 #include "tr_dump.h"

diff --git a/src/gallium/auxiliary/driver_trace/tr_dump.h b/src/gallium/auxiliary/driver_trace/tr_dump.h
index 75b3fa7..570bc1b 100644 (file)
--- a/src/gallium/auxiliary/driver_trace/tr_dump.h
+++ b/src/gallium/auxiliary/driver_trace/tr_dump.h
@@ -35,7 +35,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 struct pipe_resource;
 struct pipe_surface;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_format.h b/src/gallium/auxiliary/gallivm/lp_bld_format.h
index 74a625d..c4505b2 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_format.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_format.h
@@ -37,7 +37,7 @@
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 struct util_format_description;
 struct lp_type;

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index ec8a2af..b38f9e9 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
@@ -36,7 +36,7 @@
 #define LP_BLD_SAMPLE_H
 
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_debug.h"
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_type.h"

diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 73d1eb2..5ec2605 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -26,7 +26,7 @@
  **************************************************************************/
 
 #include "util/u_debug.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_shader_tokens.h"
 #include "tgsi_build.h"
 #include "tgsi_parse.h"

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index 59041e9..5c4efbe 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -29,7 +29,7 @@
 #define TGSI_UREG_H
 
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_compiler.h"
 #include "pipe/p_shader_tokens.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/auxiliary/translate/translate.h b/src/gallium/auxiliary/translate/translate.h
index b70d90b..f3c2b44 100644 (file)
--- a/src/gallium/auxiliary/translate/translate.h
+++ b/src/gallium/auxiliary/translate/translate.h
@@ -41,7 +41,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
 /**

diff --git a/src/gallium/auxiliary/util/u_debug_image.h b/src/gallium/auxiliary/util/u_debug_image.h
index f190eec..d687dae 100644 (file)
--- a/src/gallium/auxiliary/util/u_debug_image.h
+++ b/src/gallium/auxiliary/util/u_debug_image.h
@@ -29,7 +29,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 
 #ifdef DEBUG

diff --git a/src/gallium/auxiliary/util/u_pack_color.h b/src/gallium/auxiliary/util/u_pack_color.h
index 8218e8a..955bdcf 100644 (file)
--- a/src/gallium/auxiliary/util/u_pack_color.h
+++ b/src/gallium/auxiliary/util/u_pack_color.h
@@ -36,7 +36,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"
 

diff --git a/src/gallium/auxiliary/util/u_sampler.h b/src/gallium/auxiliary/util/u_sampler.h
index 2a09dfe..627e58f 100644 (file)
--- a/src/gallium/auxiliary/util/u_sampler.h
+++ b/src/gallium/auxiliary/util/u_sampler.h
@@ -31,7 +31,7 @@
 
 
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/auxiliary/util/u_tile.h b/src/gallium/auxiliary/util/u_tile.h
index 3dc087d..bb27929 100644 (file)
--- a/src/gallium/auxiliary/util/u_tile.h
+++ b/src/gallium/auxiliary/util/u_tile.h
@@ -29,7 +29,7 @@
 #define P_TILE_H
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
 struct pipe_context;

diff --git a/src/gallium/auxiliary/util/u_vbuf.h b/src/gallium/auxiliary/util/u_vbuf.h
index 2d6ca43..93d45ee 100644 (file)
--- a/src/gallium/auxiliary/util/u_vbuf.h
+++ b/src/gallium/auxiliary/util/u_vbuf.h
@@ -35,7 +35,7 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 struct cso_context;
 struct cso_velems_state;

diff --git a/src/gallium/auxiliary/vl/vl_winsys.h b/src/gallium/auxiliary/vl/vl_winsys.h
index 919f86c..a3945b6 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_winsys.h
+++ b/src/gallium/auxiliary/vl/vl_winsys.h
@@ -39,7 +39,7 @@
 #include <windows.h>
 #endif
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 struct pipe_screen;
 struct pipe_surface;

diff --git a/src/gallium/drivers/d3d12/d3d12_format.c b/src/gallium/drivers/d3d12/d3d12_format.c
index 93cd9ff..e653eab 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_format.c
+++ b/src/gallium/drivers/d3d12/d3d12_format.c
@@ -23,7 +23,7 @@
 
 #include "d3d12_format.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_video_enums.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"

diff --git a/src/gallium/drivers/d3d12/d3d12_format.h b/src/gallium/drivers/d3d12/d3d12_format.h
index c6f4563..31b6b15 100644 (file)
--- a/src/gallium/drivers/d3d12/d3d12_format.h
+++ b/src/gallium/drivers/d3d12/d3d12_format.h
@@ -29,7 +29,7 @@
 #include <directx/dxgiformat.h>
 #include <directx/dxgicommon.h>
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_video_enums.h"
 

diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.h b/src/gallium/drivers/etnaviv/etnaviv_context.h
index c1fcd9c..c674e74 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_context.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_context.h
@@ -34,7 +34,7 @@
 #include "etnaviv_tiling.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_shader_tokens.h"
 #include "pipe/p_state.h"
 #include "util/slab.h"

diff --git a/src/gallium/drivers/etnaviv/etnaviv_etc2.h b/src/gallium/drivers/etnaviv/etnaviv_etc2.h
index 334f05a..ed5332d 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_etc2.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_etc2.h
@@ -31,7 +31,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_dynarray.h"
 
 struct pipe_resource;

diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
index 1a13d41..82d23ac 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
@@ -32,7 +32,7 @@
 #include "etnaviv_screen.h"
 
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/drivers/etnaviv/etnaviv_translate.h b/src/gallium/drivers/etnaviv/etnaviv_translate.h
index aea4070..d155542 100644 (file)
--- a/src/gallium/drivers/etnaviv/etnaviv_translate.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_translate.h
@@ -25,7 +25,7 @@
 #define H_TRANSLATE
 
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
 #include "etnaviv_debug.h"

diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 5707a12..0e8c17d 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -32,7 +32,7 @@
 #include "drm/freedreno_drmif.h"
 #include "drm/freedreno_ringbuffer.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/compiler.h"
 #include "util/half_float.h"

diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c
index 7f6469b..7e47bae 100644 (file)
--- a/src/gallium/drivers/i915/i915_state_emit.c
+++ b/src/gallium/drivers/i915/i915_state_emit.c
@@ -34,7 +34,7 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 #include "util/format/u_format.h"
 #include "util/u_math.h"

diff --git a/src/gallium/drivers/lima/lima_format.h b/src/gallium/drivers/lima/lima_format.h
index fb47264..781f77e 100644 (file)
--- a/src/gallium/drivers/lima/lima_format.h
+++ b/src/gallium/drivers/lima/lima_format.h
@@ -26,7 +26,7 @@
 
 #include <stdbool.h>
 
-#include <pipe/p_format.h>
+#include <util/format/u_formats.h>
 
 bool lima_format_texel_supported(enum pipe_format f);
 bool lima_format_pixel_supported(enum pipe_format f);

diff --git a/src/gallium/drivers/llvmpipe/lp_bld_blend.h b/src/gallium/drivers/llvmpipe/lp_bld_blend.h
index f11172a..5cba096 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_bld_blend.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_blend.h
@@ -32,7 +32,7 @@
 #include "gallivm/lp_bld.h"
 #include "gallivm/lp_bld_init.h"
  
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 
 struct pipe_blend_state;

diff --git a/src/gallium/drivers/nouveau/nv30/nv30_context.h b/src/gallium/drivers/nouveau/nv30/nv30_context.h
index 7ea5c5b..1f5b476 100644 (file)
--- a/src/gallium/drivers/nouveau/nv30/nv30_context.h
+++ b/src/gallium/drivers/nouveau/nv30/nv30_context.h
@@ -1,7 +1,7 @@
 #ifndef __NV30_CONTEXT_H__
 #define __NV30_CONTEXT_H__
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_blitter.h"
 
 #include "nv30/nv30_screen.h"

diff --git a/src/gallium/drivers/panfrost/pan_context.h b/src/gallium/drivers/panfrost/pan_context.h
index a6081b8..474d785 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_context.h
+++ b/src/gallium/drivers/panfrost/pan_context.h
@@ -39,7 +39,7 @@
 #include "util/detect.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h"
 #include "util/u_blitter.h"

diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h
index 219c307..1855788 100644 (file)
--- a/src/gallium/drivers/r300/r300_state_inlines.h
+++ b/src/gallium/drivers/r300/r300_state_inlines.h
@@ -25,7 +25,7 @@
 #define R300_STATE_INLINES_H
 
 #include "draw/draw_vertex.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/format/u_format.h"
 #include "r300_reg.h"
 #include <stdio.h>

diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index bfc7296..fc180f7 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -24,7 +24,7 @@
 #define R300_TEXTURE_H
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 
 struct pipe_screen;

diff --git a/src/gallium/drivers/r300/r300_texture_desc.h b/src/gallium/drivers/r300/r300_texture_desc.h
index dd2a07e..b97a5cc 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture_desc.h
+++ b/src/gallium/drivers/r300/r300_texture_desc.h
@@ -24,7 +24,7 @@
 #ifndef R300_TEXTURE_DESC_H
 #define R300_TEXTURE_DESC_H
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "r300_context.h"
 
 struct pipe_resource;

diff --git a/src/gallium/drivers/svga/svga_format.c b/src/gallium/drivers/svga/svga_format.c
index 6cfc92b..4b043d7 100644 (file)
--- a/src/gallium/drivers/svga/svga_format.c
+++ b/src/gallium/drivers/svga/svga_format.c
@@ -24,7 +24,7 @@
  **********************************************************/
 
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_debug.h"
 #include "util/format/u_format.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/drivers/svga/svga_format.h b/src/gallium/drivers/svga/svga_format.h
index dae9a55..88f105a 100644 (file)
--- a/src/gallium/drivers/svga/svga_format.h
+++ b/src/gallium/drivers/svga/svga_format.h
@@ -27,7 +27,7 @@
 #define SVGA_FORMAT_H_
 
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "svga_context.h"
 #include "svga_types.h"
 #include "svga_reg.h"

diff --git a/src/gallium/drivers/zink/zink_format.h b/src/gallium/drivers/zink/zink_format.h
index 53ddd06..fc9aa27 100644 (file)
--- a/src/gallium/drivers/zink/zink_format.h
+++ b/src/gallium/drivers/zink/zink_format.h
@@ -24,7 +24,7 @@
 #ifndef ZINK_FORMAT_H
 #define ZINK_FORMAT_H
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/format/u_format.h"
 
 #include <stdbool.h>

diff --git a/src/gallium/frontends/clover/core/format.hpp b/src/gallium/frontends/clover/core/format.hpp
index a66a817..f93f7a7 100644 (file)
--- a/src/gallium/frontends/clover/core/format.hpp
+++ b/src/gallium/frontends/clover/core/format.hpp
@@ -27,7 +27,7 @@
 
 #include "core/object.hpp"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 namespace clover {
    pipe_texture_target translate_target(cl_mem_object_type type);

diff --git a/src/gallium/frontends/d3d10umd/DriverIncludes.h b/src/gallium/frontends/d3d10umd/DriverIncludes.h
index c7df640..f71d19c 100644 (file)
--- a/src/gallium/frontends/d3d10umd/DriverIncludes.h
+++ b/src/gallium/frontends/d3d10umd/DriverIncludes.h
@@ -64,7 +64,7 @@
 
 #include "pipe/p_screen.h"
 #include "pipe/p_context.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 
 #include "util/u_debug.h"

diff --git a/src/gallium/frontends/dri/dri_drawable.h b/src/gallium/frontends/dri/dri_drawable.h
index f045309..de05f6b 100644 (file)
--- a/src/gallium/frontends/dri/dri_drawable.h
+++ b/src/gallium/frontends/dri/dri_drawable.h
@@ -29,7 +29,7 @@
 #define DRI_DRAWABLE_H
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "frontend/api.h"
 #include "dri_util.h"
 

diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
index e3be46a..9f2f782 100644 (file)
--- a/src/gallium/frontends/dri/dri_screen.c
+++ b/src/gallium/frontends/dri/dri_screen.c
@@ -35,7 +35,7 @@
 
 #include "util/u_inlines.h"
 #include "pipe/p_screen.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe-loader/pipe_loader.h"
 #include "frontend/drm_driver.h"
 

diff --git a/src/gallium/frontends/hgl/hgl.c b/src/gallium/frontends/hgl/hgl.c
index 992c174..766c553 100644 (file)
--- a/src/gallium/frontends/hgl/hgl.c
+++ b/src/gallium/frontends/hgl/hgl.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_atomic.h"
 #include "util/format/u_format.h"
 #include "util/u_memory.h"

diff --git a/src/gallium/frontends/hgl/hgl_context.h b/src/gallium/frontends/hgl/hgl_context.h
index f952e41..2266f95 100644 (file)
--- a/src/gallium/frontends/hgl/hgl_context.h
+++ b/src/gallium/frontends/hgl/hgl_context.h
@@ -9,7 +9,7 @@
 #define HGL_CONTEXT_H
 
 #include "util/u_thread.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_compiler.h"
 #include "pipe/p_screen.h"
 #include "postprocess/filters.h"

diff --git a/src/gallium/frontends/nine/buffer9.c b/src/gallium/frontends/nine/buffer9.c
index 84eb8bb..836da59 100644 (file)
--- a/src/gallium/frontends/nine/buffer9.c
+++ b/src/gallium/frontends/nine/buffer9.c
@@ -32,7 +32,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_box.h"
 #include "util/u_inlines.h"
 

diff --git a/src/gallium/frontends/nine/indexbuffer9.c b/src/gallium/frontends/nine/indexbuffer9.c
index e73d29b..0fd0591 100644 (file)
--- a/src/gallium/frontends/nine/indexbuffer9.c
+++ b/src/gallium/frontends/nine/indexbuffer9.c
@@ -30,7 +30,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_box.h"
 
 #define DBG_CHANNEL DBG_INDEXBUFFER

diff --git a/src/gallium/frontends/nine/nine_pipe.h b/src/gallium/frontends/nine/nine_pipe.h
index 207945c..f237a8b 100644 (file)
--- a/src/gallium/frontends/nine/nine_pipe.h
+++ b/src/gallium/frontends/nine/nine_pipe.h
@@ -24,7 +24,7 @@
 #define _NINE_PIPE_H_
 
 #include "d3d9.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_screen.h"
 #include "pipe/p_state.h" /* pipe_box */
 #include "util/macros.h"

diff --git a/src/gallium/frontends/nine/vertexbuffer9.c b/src/gallium/frontends/nine/vertexbuffer9.c
index df1d171..93fef4a 100644 (file)
--- a/src/gallium/frontends/nine/vertexbuffer9.c
+++ b/src/gallium/frontends/nine/vertexbuffer9.c
@@ -29,7 +29,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_box.h"
 
 #define DBG_CHANNEL DBG_VERTEXBUFFER

diff --git a/src/gallium/frontends/nine/vertexdeclaration9.c b/src/gallium/frontends/nine/vertexdeclaration9.c
index c5001e5..602c2f3 100644 (file)
--- a/src/gallium/frontends/nine/vertexdeclaration9.c
+++ b/src/gallium/frontends/nine/vertexdeclaration9.c
@@ -26,7 +26,7 @@
 #include "nine_helpers.h"
 #include "nine_shader.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_context.h"
 #include "util/u_math.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/frontends/wgl/stw_pixelformat.c b/src/gallium/frontends/wgl/stw_pixelformat.c
index 2c0d156..ca6a134 100644 (file)
--- a/src/gallium/frontends/wgl/stw_pixelformat.c
+++ b/src/gallium/frontends/wgl/stw_pixelformat.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_screen.h"
 

diff --git a/src/gallium/frontends/wgl/stw_pixelformat.h b/src/gallium/frontends/wgl/stw_pixelformat.h
index 3999c8e..d7a0d4c 100644 (file)
--- a/src/gallium/frontends/wgl/stw_pixelformat.h
+++ b/src/gallium/frontends/wgl/stw_pixelformat.h
@@ -35,7 +35,7 @@
 #endif
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "frontend/api.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/frontends/xa/xa_tgsi.c b/src/gallium/frontends/xa/xa_tgsi.c
index 33e9ef8..48d7599 100644 (file)
--- a/src/gallium/frontends/xa/xa_tgsi.c
+++ b/src/gallium/frontends/xa/xa_tgsi.c
@@ -27,7 +27,7 @@
  */
 #include "xa_priv.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_shader_tokens.h"

diff --git a/src/gallium/frontends/xa/xa_tracker.c b/src/gallium/frontends/xa/xa_tracker.c
index c802a40..70c5659 100644 (file)
--- a/src/gallium/frontends/xa/xa_tracker.c
+++ b/src/gallium/frontends/xa/xa_tracker.c
@@ -30,7 +30,7 @@
 #include "xa_tracker.h"
 #include "xa_priv.h"
 #include "pipe/p_state.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe-loader/pipe_loader.h"
 #include "frontend/drm_driver.h"
 #include "util/u_inlines.h"

diff --git a/src/gallium/include/frontend/api.h b/src/gallium/include/frontend/api.h
index f113b72..b82ec2c 100644 (file)
--- a/src/gallium/include/frontend/api.h
+++ b/src/gallium/include/frontend/api.h
@@ -27,7 +27,7 @@
 #ifndef _API_H_
 #define _API_H_
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 /**
  * \file API for communication between gallium frontends and supporting

diff --git a/src/gallium/include/frontend/sw_winsys.h b/src/gallium/include/frontend/sw_winsys.h
index d412cc8..45ad81b 100644 (file)
--- a/src/gallium/include/frontend/sw_winsys.h
+++ b/src/gallium/include/frontend/sw_winsys.h
@@ -35,7 +35,7 @@
 #define SW_WINSYS_H
 
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "frontend/winsys_handle.h"
 
 #ifdef __cplusplus

diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 1143344..9eff0d8 100644 (file)
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -29,7 +29,7 @@
 #define PIPE_CONTEXT_H
 
 #include "p_compiler.h"
-#include "p_format.h"
+#include "util/format/u_formats.h"
 #include "p_video_enums.h"
 #include "p_defines.h"
 #include "util/u_debug.h"

diff --git a/src/gallium/include/pipe/p_screen.h b/src/gallium/include/pipe/p_screen.h
index 3592f83..bf7002c 100644 (file)
--- a/src/gallium/include/pipe/p_screen.h
+++ b/src/gallium/include/pipe/p_screen.h
@@ -39,7 +39,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_video_enums.h"
 

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 4fe3db9..e2003f3 100644 (file)
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -46,7 +46,7 @@
 
 #include "p_compiler.h"
 #include "p_defines.h"
-#include "p_format.h"
+#include "util/format/u_formats.h"
 
 
 #ifdef __cplusplus

diff --git a/src/gallium/include/pipe/p_video_state.h b/src/gallium/include/pipe/p_video_state.h
index 5d51d98..671bc51 100644 (file)
--- a/src/gallium/include/pipe/p_video_state.h
+++ b/src/gallium/include/pipe/p_video_state.h
@@ -29,7 +29,7 @@
 #define PIPE_VIDEO_STATE_H
 
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "pipe/p_screen.h"
 #include "util/u_hash_table.h"

diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index db0ef9e..a3ba48b 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -18,7 +18,7 @@
 #include "bitmap_wrapper.h"
 
 #include "glapi/glapi.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 //#include "state_tracker/st_cb_fbo.h"
 //#include "state_tracker/st_cb_flush.h"
 #include "state_tracker/st_context.h"

diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index e319d50..35a267f 100644 (file)
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -38,7 +38,7 @@
 #endif
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
index 87ffbcc..49a138c 100644 (file)
--- a/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
+++ b/src/gallium/winsys/sw/gdi/gdi_sw_winsys.c
@@ -36,7 +36,7 @@
 
 #include <windows.h>
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_context.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
index 564f9f6..3c0dc4d 100644 (file)
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.cpp
@@ -29,7 +29,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"
 #include "util/u_math.h"

diff --git a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
index aa1257a..1989831 100644 (file)
--- a/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
@@ -43,7 +43,7 @@
 #include <xf86drm.h>
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"

diff --git a/src/gallium/winsys/sw/null/null_sw_winsys.c b/src/gallium/winsys/sw/null/null_sw_winsys.c
index a39f74c..60d2a83 100644 (file)
--- a/src/gallium/winsys/sw/null/null_sw_winsys.c
+++ b/src/gallium/winsys/sw/null/null_sw_winsys.c
@@ -37,7 +37,7 @@
 
 #include <stdio.h>
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_memory.h"
 #include "frontend/sw_winsys.h"
 #include "null_sw_winsys.h"

diff --git a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
index a61a445..427cbff 100644 (file)
--- a/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
+++ b/src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c
@@ -26,7 +26,7 @@
 
 #include "wrapper_sw_winsys.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_state.h"
 
 #include "frontend/sw_winsys.h"

diff --git a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
index 57e1308..7141fcb 100644 (file)
--- a/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
+++ b/src/gallium/winsys/sw/xlib/xlib_sw_winsys.c
@@ -32,7 +32,7 @@
  *   Brian Paul
  */
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_context.h"
 #include "util/u_inlines.h"
 #include "util/format/u_format.h"

diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index ff31314..0f5e01a 100644 (file)
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 
 #include "util/glheader.h"
-#include "gallium/include/pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "util/u_endian.h"
 
 #ifdef __cplusplus
@@ -240,7 +240,7 @@ _mesa_format_is_mesa_array_format(uint32_t f)
 
 /**
  * Mesa texture/renderbuffer image formats.  These are just other names of the
- * gallium p_format.h formats.
+ * util/format/u_formats.h formats.
  */
 typedef enum pipe_format mesa_format;
 

diff --git a/src/mesa/state_tracker/st_format.h b/src/mesa/state_tracker/st_format.h
index 88c334c..9692a0b 100644 (file)
--- a/src/mesa/state_tracker/st_format.h
+++ b/src/mesa/state_tracker/st_format.h
@@ -33,7 +33,7 @@
 #include "main/formats.h"
 #include "util/glheader.h"
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build
index da6729d..c3d2720 100644 (file)
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -77,7 +77,7 @@ foreach arch : ['6', '7']
       inc_include,
       inc_src,
       inc_compiler,
-      inc_gallium, # XXX: pipe/p_format.h
+      inc_gallium, # XXX: util/format/u_formats.h
       inc_gallium_aux, # XXX: renderonly
       inc_panfrost,
     ],
@@ -106,7 +106,7 @@ libvulkan_panfrost = shared_library(
     inc_include,
     inc_src,
     inc_compiler,
-    inc_gallium, # XXX: pipe/p_format.h
+    inc_gallium, # XXX: util/format/u_formats.h
     inc_gallium_aux, # XXX: renderonly
     inc_panfrost,
   ],

diff --git a/src/util/format/u_format.h b/src/util/format/u_format.h
index dab51bc..cf9b0ce 100644 (file)
--- a/src/util/format/u_format.h
+++ b/src/util/format/u_format.h
@@ -30,7 +30,7 @@
 #define U_FORMAT_H
 
 
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 #include "pipe/p_defines.h"
 #include "util/u_debug.h"
 

diff --git a/src/util/format/u_format_tests.h b/src/util/format/u_format_tests.h
index d5f0b34..5ef3eed 100644 (file)
--- a/src/util/format/u_format_tests.h
+++ b/src/util/format/u_format_tests.h
@@ -31,7 +31,7 @@
 
 
 #include "pipe/p_compiler.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 
 #define UTIL_FORMAT_MAX_PACKED_BYTES 32  // R64G64B64A64_FLOAT

diff --git a/src/gallium/include/pipe/p_format.h b/src/util/format/u_formats.h
similarity index 99%
rename from src/gallium/include/pipe/p_format.h
rename to src/util/format/u_formats.h
index 4e2919f..3532a05 100644 (file)
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/util/format/u_formats.h
@@ -26,8 +26,8 @@
  *
  **************************************************************************/
 
-#ifndef PIPE_FORMAT_H
-#define PIPE_FORMAT_H
+#ifndef U_FORMATS_H_
+#define U_FORMATS_H_
 
 #include "util/detect.h"
 
@@ -647,4 +647,4 @@ pipe_format_to_chroma_format(enum pipe_format format)
 }
 #endif
 
-#endif
+#endif /* U_FORMATS_H_ */

diff --git a/src/util/tests/format/srgb.c b/src/util/tests/format/srgb.c
index 9b3c15e..1e856d4 100644 (file)
--- a/src/util/tests/format/srgb.c
+++ b/src/util/tests/format/srgb.c
@@ -3,7 +3,7 @@
 
 #include "util/macros.h"
 #include "util/format/u_format.h"
-#include "pipe/p_format.h"
+#include "util/format/u_formats.h"
 
 int main(void)
 {