From 2a090ae80a597f498f113fe58a772ddf3dca12e0 Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Fri, 2 Apr 2010 04:51:50 +0200 Subject: gallium/util: revert util_format_init addition Putting calls to util_format_init all over the codebase is infeasible. Instead, half float tables are pregenerated, and the s3tc library is loaded on demand. I believe this is a solution that combines performance, cleanliness, flexibility and portability. --- src/gallium/auxiliary/util/u_format.c | 8 -------- src/gallium/auxiliary/util/u_format.h | 2 -- 2 files changed, 10 deletions(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c index fae0a462dc..112490f3b4 100644 --- a/src/gallium/auxiliary/util/u_format.c +++ b/src/gallium/auxiliary/util/u_format.c @@ -117,11 +117,3 @@ util_format_write_4ub(enum pipe_format format, const uint8_t *src, unsigned src_ format_desc->pack_8unorm(dst_row, dst_stride, src_row, src_stride, w, h); } - -boolean util_format_inited; - -void -util_format_do_init(void) -{ - util_format_s3tc_init(); -} diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h index fc550405d8..2ac3abab23 100644 --- a/src/gallium/auxiliary/util/u_format.h +++ b/src/gallium/auxiliary/util/u_format.h @@ -552,8 +552,6 @@ util_format_write_4ub(enum pipe_format format, void *dst, unsigned dst_stride, unsigned x, unsigned y, unsigned w, unsigned h); -UTIL_INLINE_INIT(util_format); - #ifdef __cplusplus } // extern "C" { #endif -- cgit v1.2.3