From 253b521b6e9d1ddf978c0d256a096f29b3040e70 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 24 Aug 2022 14:41:47 +0200 Subject: [PATCH] mesa/main: remove always-true define MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't include this header anwhere where BPTC_BLOCK_DECODE isn't already true, so let's remove it. Acked-by: Marek Olšák Acked-by: Soroush Kashani Part-of: --- src/mesa/main/texcompress_bptc.c | 2 -- src/mesa/main/texcompress_bptc_tmp.h | 4 ---- src/util/format/u_format_bptc.c | 1 - 3 files changed, 7 deletions(-) diff --git a/src/mesa/main/texcompress_bptc.c b/src/mesa/main/texcompress_bptc.c index d3269bf1a3b..aa96dd61e2f 100644 --- a/src/mesa/main/texcompress_bptc.c +++ b/src/mesa/main/texcompress_bptc.c @@ -26,8 +26,6 @@ * GL_ARB_texture_compression_bptc support. */ -#define BPTC_BLOCK_DECODE - #include #include "texcompress.h" #include "texcompress_bptc.h" diff --git a/src/mesa/main/texcompress_bptc_tmp.h b/src/mesa/main/texcompress_bptc_tmp.h index 4f92fe86f6f..1ffeba8db15 100644 --- a/src/mesa/main/texcompress_bptc_tmp.h +++ b/src/mesa/main/texcompress_bptc_tmp.h @@ -652,7 +652,6 @@ fetch_rgba_unorm_from_block(const uint8_t *block, apply_rotation(rotation, result); } -#ifdef BPTC_BLOCK_DECODE static void decompress_rgba_unorm_block(int src_width, int src_height, const uint8_t *block, @@ -816,7 +815,6 @@ decompress_rgba_unorm(int width, int height, src += src_row_diff; } } -#endif // BPTC_BLOCK_DECODE static int signed_unquantize(int value, int n_endpoint_bits) @@ -1029,7 +1027,6 @@ fetch_rgb_float_from_block(const uint8_t *block, result[3] = 1.0f; } -#ifdef BPTC_BLOCK_DECODE static void decompress_rgb_float_block(unsigned src_width, unsigned src_height, const uint8_t *block, @@ -1158,7 +1155,6 @@ decompress_rgb_float(int width, int height, src += src_row_diff; } } -#endif // BPTC_BLOCK_DECODE static void write_bits(struct bit_writer *writer, int n_bits, int value) diff --git a/src/util/format/u_format_bptc.c b/src/util/format/u_format_bptc.c index 7cf9cf40e56..ef25951527b 100644 --- a/src/util/format/u_format_bptc.c +++ b/src/util/format/u_format_bptc.c @@ -29,7 +29,6 @@ #include "util/format_srgb.h" #include "util/u_math.h" -#define BPTC_BLOCK_DECODE #include "../../mesa/main/texcompress_bptc_tmp.h" void