util/u_format: move utility function from r600g

We need this for radeonsi, and it might be useful for other drivers,
too.

diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c
index 056f82f72e5dfe08d2986ab2fbf50852afc960c9..a53ed6f297b6b2c1e2eff225e50f2751091a6850 100644 (file)
--- a/src/gallium/auxiliary/util/u_format.c
+++ b/src/gallium/auxiliary/util/u_format.c
@@ -187,6 +187,17 @@ util_format_is_intensity(enum pipe_format format)
    return FALSE;
 }
 
+boolean
+util_format_is_subsampled_422(enum pipe_format format)
+{
+   const struct util_format_description *desc =
+      util_format_description(format);
+
+   return desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED &&
+      desc->block.width == 2 &&
+      desc->block.height == 1 &&
+      desc->block.bits == 32;
+}
 
 boolean
 util_format_is_supported(enum pipe_format format, unsigned bind)

diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h
index 1dd5d52f1e615d07edfd4062f4d3325546012312..2e2bf0240dd5ec46bdd81a21965919d3a4a01f75 100644 (file)
--- a/src/gallium/auxiliary/util/u_format.h
+++ b/src/gallium/auxiliary/util/u_format.h
@@ -663,6 +663,9 @@ util_format_is_luminance_alpha(enum pipe_format format);
 boolean
 util_format_is_intensity(enum pipe_format format);
 
+boolean
+util_format_is_subsampled_422(enum pipe_format format);
+
 boolean
 util_format_is_pure_integer(enum pipe_format format);
 

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 3269c476fd4824872b36616ca4cb3554c31d3213..962be60c1086873f06a5bd517825425ccaf5f9bf 100644 (file)
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -563,16 +563,6 @@ static void r600_clear_buffer(struct pipe_context *ctx, struct pipe_resource *ds
        }
 }
 
-static bool util_format_is_subsampled_2x1_32bpp(enum pipe_format format)
-{
-       const struct util_format_description *desc = util_format_description(format);
-
-       return desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED &&
-              desc->block.width == 2 &&
-              desc->block.height == 1 &&
-              desc->block.bits == 32;
-}
-
 static void r600_resource_copy_region(struct pipe_context *ctx,
                                      struct pipe_resource *dst,
                                      unsigned dst_level,
@@ -647,7 +637,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
 
                src_force_level = src_level;
        } else if (!util_blitter_is_copy_supported(rctx->blitter, dst, src)) {
-               if (util_format_is_subsampled_2x1_32bpp(src->format)) {
+               if (util_format_is_subsampled_422(src->format)) {
 
                        src_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
                        dst_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;