From 2a090ae80a597f498f113fe58a772ddf3dca12e0 Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Fri, 2 Apr 2010 04:51:50 +0200 Subject: [PATCH] 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. --- progs/gallium/unit/u_format_test.c | 4 ---- src/gallium/auxiliary/util/u_format.c | 8 -------- src/gallium/auxiliary/util/u_format.h | 2 -- src/gallium/drivers/nv50/nv50_context.c | 2 -- src/gallium/drivers/softpipe/sp_screen.c | 2 +- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/progs/gallium/unit/u_format_test.c b/progs/gallium/unit/u_format_test.c index 9883e1e41ca..2fb7badd629 100644 --- a/progs/gallium/unit/u_format_test.c +++ b/progs/gallium/unit/u_format_test.c @@ -30,10 +30,8 @@ #include #include -#include "util/u_half.h" #include "util/u_format.h" #include "util/u_format_tests.h" -#include "util/u_format_s3tc.h" static boolean @@ -402,8 +400,6 @@ int main(int argc, char **argv) { boolean success; - util_format_init(); - success = test_all(); return success ? 0 : 1; diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c index fae0a462dcb..112490f3b41 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 fc550405d87..2ac3abab23a 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 diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 0de75a70b98..92b194a8f82 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -71,8 +71,6 @@ nv50_create(struct pipe_screen *pscreen, void *priv) struct nv50_screen *screen = nv50_screen(pscreen); struct nv50_context *nv50; - util_format_init(); - nv50 = CALLOC_STRUCT(nv50_context); if (!nv50) return NULL; diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index df527f5cb15..5c1012b4006 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -224,7 +224,7 @@ softpipe_create_screen(struct sw_winsys *winsys) screen->base.context_create = softpipe_create_context; screen->base.flush_frontbuffer = softpipe_flush_frontbuffer; - util_format_init(); + util_format_s3tc_init(); softpipe_init_screen_texture_funcs(&screen->base); softpipe_init_screen_buffer_funcs(&screen->base); -- 2.30.2