[Mesa-dev] [PATCH 1/3] gallium/util: remove the fake format helpers for bptc and etc2

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Sat, Nov 21, 2015 at 9:03 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> This was a silly hack that kept growing and growing. Instead, just write
> NULLs for those functions. No need to have helpers that just assert(0)
> when you call them.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/gallium/auxiliary/Makefile.sources       |  2 -
>  src/gallium/auxiliary/util/u_format_fake.c   | 37 ----------------
>  src/gallium/auxiliary/util/u_format_fake.h   | 66 ----------------------------
>  src/gallium/auxiliary/util/u_format_table.py | 10 +++--
>  4 files changed, 7 insertions(+), 108 deletions(-)
>  delete mode 100644 src/gallium/auxiliary/util/u_format_fake.c
>  delete mode 100644 src/gallium/auxiliary/util/u_format_fake.h
>
> diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
> index 82ef5ec..6160192 100644
> --- a/src/gallium/auxiliary/Makefile.sources
> +++ b/src/gallium/auxiliary/Makefile.sources
> @@ -219,8 +219,6 @@ C_SOURCES := \
>         util/u_format.h \
>         util/u_format_etc.c \
>         util/u_format_etc.h \
> -       util/u_format_fake.c \
> -       util/u_format_fake.h \
>         util/u_format_latc.c \
>         util/u_format_latc.h \
>         util/u_format_other.c \
> diff --git a/src/gallium/auxiliary/util/u_format_fake.c b/src/gallium/auxiliary/util/u_format_fake.c
> deleted file mode 100644
> index 77e896d..0000000
> --- a/src/gallium/auxiliary/util/u_format_fake.c
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -#include "u_format.h"
> -#include "u_format_fake.h"
> -
> -#define fake(format) \
> -void \
> -util_format_##format##_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) {assert(0);} \
> -\
> -void \
> -util_format_##format##_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) {assert(0);} \
> -\
> -void \
> -util_format_##format##_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) {assert(0);} \
> -\
> -void \
> -util_format_##format##_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) {assert(0);} \
> -\
> -void \
> -util_format_##format##_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height) {assert(0);} \
> -\
> -void \
> -util_format_##format##_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j) {assert(0);}
> -
> -fake(bptc_rgba_unorm)
> -fake(bptc_srgba)
> -fake(bptc_rgb_float)
> -fake(bptc_rgb_ufloat)
> -
> -fake(etc2_rgb8)
> -fake(etc2_srgb8)
> -fake(etc2_rgb8a1)
> -fake(etc2_srgb8a1)
> -fake(etc2_rgba8)
> -fake(etc2_srgba8)
> -fake(etc2_r11_unorm)
> -fake(etc2_r11_snorm)
> -fake(etc2_rg11_unorm)
> -fake(etc2_rg11_snorm)
> diff --git a/src/gallium/auxiliary/util/u_format_fake.h b/src/gallium/auxiliary/util/u_format_fake.h
> deleted file mode 100644
> index e6bfd4e..0000000
> --- a/src/gallium/auxiliary/util/u_format_fake.h
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -/**************************************************************************
> - *
> - * Copyright 2011 Red Hat Inc.
> - * All Rights Reserved.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the
> - * "Software"), to deal in the Software without restriction, including
> - * without limitation the rights to use, copy, modify, merge, publish,
> - * distribute, sub license, and/or sell copies of the Software, and to
> - * permit persons to whom the Software is furnished to do so, subject to
> - * the following conditions:
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
> - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
> - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
> - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
> - * USE OR OTHER DEALINGS IN THE SOFTWARE.
> - *
> - * The above copyright notice and this permission notice (including the
> - * next paragraph) shall be included in all copies or substantial portions
> - * of the Software.
> - *
> - **************************************************************************/
> -
> -#ifndef U_FORMAT_FAKE_H_
> -#define U_FORMAT_FAKE_H_
> -
> -#define __format_fake(format) \
> -void \
> -util_format_##format##_fetch_rgba_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j); \
> -\
> -void \
> -util_format_##format##_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height); \
> -\
> -void \
> -util_format_##format##_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height); \
> -\
> -void \
> -util_format_##format##_unpack_rgba_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height); \
> -\
> -void \
> -util_format_##format##_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height); \
> -\
> -void \
> -util_format_##format##_fetch_rgba_float(float *dst, const uint8_t *src, unsigned i, unsigned j);
> -
> -__format_fake(bptc_rgba_unorm)
> -__format_fake(bptc_srgba)
> -__format_fake(bptc_rgb_float)
> -__format_fake(bptc_rgb_ufloat)
> -
> -__format_fake(etc2_rgb8)
> -__format_fake(etc2_srgb8)
> -__format_fake(etc2_rgb8a1)
> -__format_fake(etc2_srgb8a1)
> -__format_fake(etc2_rgba8)
> -__format_fake(etc2_srgba8)
> -__format_fake(etc2_r11_unorm)
> -__format_fake(etc2_r11_snorm)
> -__format_fake(etc2_rg11_unorm)
> -__format_fake(etc2_rg11_snorm)
> -
> -#endif
> diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py
> index aceb0ca..1fec0cb 100755
> --- a/src/gallium/auxiliary/util/u_format_table.py
> +++ b/src/gallium/auxiliary/util/u_format_table.py
> @@ -90,7 +90,6 @@ def write_format_table(formats):
>      print '#include "u_format_rgtc.h"'
>      print '#include "u_format_latc.h"'
>      print '#include "u_format_etc.h"'
> -    print '#include "u_format_fake.h"'
>      print
>
>      u_format_pack.generate(formats)
> @@ -139,10 +138,15 @@ def write_format_table(formats):
>          u_format_pack.print_channels(format, do_channel_array)
>          u_format_pack.print_channels(format, do_swizzle_array)
>          print "   %s," % (colorspace_map(format.colorspace),)
> -        if format.colorspace != ZS and not format.is_pure_color():
> +        access = True
> +        if format.layout == 'bptc':
> +            access = False
> +        if format.layout == 'etc' and format.short_name() != 'etc1_rgb8':
> +            access = False
> +        if format.colorspace != ZS and not format.is_pure_color() and access:
>              print "   &util_format_%s_unpack_rgba_8unorm," % format.short_name()
>              print "   &util_format_%s_pack_rgba_8unorm," % format.short_name()
> -            if format.layout == 's3tc' or format.layout == 'rgtc' or format.layout == 'bptc':
> +            if format.layout == 's3tc' or format.layout == 'rgtc':
>                  print "   &util_format_%s_fetch_rgba_8unorm," % format.short_name()
>              else:
>                  print "   NULL, /* fetch_rgba_8unorm */"
> --
> 2.4.10
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev