From: Eric Anholt Date: Thu, 13 Aug 2020 16:05:32 +0000 (-0700) Subject: uitl: Add R1_UNORM to the list of noaccess (no pack/unpack) formats. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=80babbbf7ea4facc653b1dbecd3a8b1de43dabed;p=mesa.git uitl: Add R1_UNORM to the list of noaccess (no pack/unpack) formats. The functions were just stubs, if you called them you would be terribly disappointed. Reviewed-by: Marek Olšák Part-of: --- diff --git a/src/util/format/u_format_other.c b/src/util/format/u_format_other.c index 4f304e00130..6dd66c7d346 100644 --- a/src/util/format/u_format_other.c +++ b/src/util/format/u_format_other.c @@ -237,50 +237,6 @@ util_format_r11g11b10_float_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stri } } - -void -util_format_r1_unorm_unpack_rgba_float(UNUSED void *dst_row, UNUSED unsigned dst_stride, - UNUSED const uint8_t *src_row, UNUSED unsigned src_stride, - UNUSED unsigned width, UNUSED unsigned height) -{ - -} - - -void -util_format_r1_unorm_pack_rgba_float(UNUSED uint8_t *dst_row, UNUSED unsigned dst_stride, - UNUSED const float *src_row, UNUSED unsigned src_stride, - UNUSED unsigned width, UNUSED unsigned height) -{ - -} - - -void -util_format_r1_unorm_fetch_rgba_float(UNUSED float *dst, UNUSED const uint8_t *src, - UNUSED unsigned i, UNUSED unsigned j) -{ - -} - - -void -util_format_r1_unorm_unpack_rgba_8unorm(UNUSED uint8_t *dst_row, UNUSED unsigned dst_stride, - UNUSED const uint8_t *src_row, UNUSED unsigned src_stride, - UNUSED unsigned width, UNUSED unsigned height) -{ - -} - - -void -util_format_r1_unorm_pack_rgba_8unorm(UNUSED uint8_t *dst_row, UNUSED unsigned dst_stride, - UNUSED const uint8_t *src_row, UNUSED unsigned src_stride, - UNUSED unsigned width, UNUSED unsigned height) -{ -} - - /* * PIPE_FORMAT_R8G8Bx_SNORM * diff --git a/src/util/format/u_format_other.h b/src/util/format/u_format_other.h index 8ca5d05bc8f..df9d057754f 100644 --- a/src/util/format/u_format_other.h +++ b/src/util/format/u_format_other.h @@ -83,30 +83,6 @@ util_format_r11g11b10_float_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stri unsigned width, unsigned height); -void -util_format_r1_unorm_unpack_rgba_float(void *dst_row, unsigned dst_stride, - const uint8_t *src_row, unsigned src_stride, - unsigned width, unsigned height); - -void -util_format_r1_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride, - const float *src_row, unsigned src_stride, - unsigned width, unsigned height); - -void -util_format_r1_unorm_fetch_rgba_float(float *dst, const uint8_t *src, - unsigned i, unsigned j); - -void -util_format_r1_unorm_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_r1_unorm_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_r8g8bx_snorm_unpack_rgba_float(void *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, diff --git a/src/util/format/u_format_table.py b/src/util/format/u_format_table.py index e079da44a64..3699e025290 100644 --- a/src/util/format/u_format_table.py +++ b/src/util/format/u_format_table.py @@ -82,6 +82,7 @@ def has_access(format): # We don't generate code for YUV formats, and many of the new ones lack # pack/unpack functions for softpipe/llvmpipe. noaccess_formats = [ + 'r1_unorm', 'yv12', 'yv16', 'iyuv',