diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.c | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format.h | 22 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_s3tc.c | 264 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_format_s3tc.h | 4 | ||||
| -rwxr-xr-x | src/gallium/auxiliary/util/u_format_table.py | 3 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_inline_init.h | 15 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 23 |
8 files changed, 130 insertions, 205 deletions
diff --git a/src/gallium/auxiliary/util/u_format.c b/src/gallium/auxiliary/util/u_format.c index 112490f3b41..7f16cf7d018 100644 --- a/src/gallium/auxiliary/util/u_format.c +++ b/src/gallium/auxiliary/util/u_format.c @@ -33,8 +33,6 @@ */ #include "u_format.h" -#include "u_format_s3tc.h" -#include "u_half.h" void @@ -117,3 +115,4 @@ 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); } + diff --git a/src/gallium/auxiliary/util/u_format.h b/src/gallium/auxiliary/util/u_format.h index 2ac3abab23a..93818a31611 100644 --- a/src/gallium/auxiliary/util/u_format.h +++ b/src/gallium/auxiliary/util/u_format.h @@ -32,7 +32,6 @@ #include "pipe/p_format.h" #include "util/u_debug.h" -#include "util/u_format_s3tc.h" #ifdef __cplusplus extern "C" { @@ -169,13 +168,6 @@ struct util_format_description unsigned is_mixed:1; /** - * Whether the pack/unpack functions actually work. - * - * Call util_format_is_supported instead of using this directly. - */ - unsigned is_supported:1; - - /** * Input channel description. * * Only valid for UTIL_FORMAT_LAYOUT_PLAIN formats. @@ -514,20 +506,6 @@ util_format_get_nr_components(enum pipe_format format) * Format access functions. */ -static INLINE boolean -util_format_is_supported(enum pipe_format format) -{ - const struct util_format_description *desc = util_format_description(format); - - if(!desc) - return FALSE; - - if(desc->layout == UTIL_FORMAT_LAYOUT_S3TC) - util_format_s3tc_init(); - - return desc->is_supported; -} - void util_format_read_4f(enum pipe_format format, float *dst, unsigned dst_stride, diff --git a/src/gallium/auxiliary/util/u_format_s3tc.c b/src/gallium/auxiliary/util/u_format_s3tc.c index d48551f23ba..268f0e8dfab 100644 --- a/src/gallium/auxiliary/util/u_format_s3tc.c +++ b/src/gallium/auxiliary/util/u_format_s3tc.c @@ -34,129 +34,59 @@ #define DXTN_LIBNAME "libtxc_dxtn.so" #endif -static void -util_format_dxt1_rgb_fetch_stub( int src_stride, - const uint8_t *src, - int col, int row, - uint8_t *dst ) -{ - util_format_s3tc_init(); - util_format_dxt1_rgb_fetch(src_stride, src, col, row, dst); -} - -static void -util_format_dxt1_rgba_fetch_stub( int src_stride, - const uint8_t *src, - int col, int row, - uint8_t *dst ) -{ - util_format_s3tc_init(); - util_format_dxt1_rgba_fetch(src_stride, src, col, row, dst); -} - -static void -util_format_dxt3_rgba_fetch_stub( int src_stride, - const uint8_t *src, - int col, int row, - uint8_t *dst ) -{ - util_format_s3tc_init(); - util_format_dxt3_rgba_fetch(src_stride, src, col, row, dst); -} -static void -util_format_dxt5_rgba_fetch_stub( int src_stride, - const uint8_t *src, - int col, int row, - uint8_t *dst ) -{ - util_format_s3tc_init(); - util_format_dxt5_rgba_fetch(src_stride, src, col, row, dst); -} - -static -void util_format_dxtn_pack_stub( int src_comps, - int width, int height, - const uint8_t *src, - enum util_format_dxtn dst_format, - uint8_t *dst, - int dst_stride) -{ - util_format_s3tc_init(); - util_format_dxtn_pack_stub(src_comps, width, height, src, dst_format, dst, dst_stride); -} - -boolean util_format_s3tc_inited = FALSE; +boolean util_format_s3tc_enabled = FALSE; -util_format_dxtn_fetch_t util_format_dxt1_rgb_fetch = util_format_dxt1_rgb_fetch_stub; -util_format_dxtn_fetch_t util_format_dxt1_rgba_fetch = util_format_dxt1_rgba_fetch_stub; -util_format_dxtn_fetch_t util_format_dxt3_rgba_fetch = util_format_dxt3_rgba_fetch_stub; -util_format_dxtn_fetch_t util_format_dxt5_rgba_fetch = util_format_dxt5_rgba_fetch_stub; +util_format_dxtn_fetch_t util_format_dxt1_rgb_fetch = NULL; +util_format_dxtn_fetch_t util_format_dxt1_rgba_fetch = NULL; +util_format_dxtn_fetch_t util_format_dxt3_rgba_fetch = NULL; +util_format_dxtn_fetch_t util_format_dxt5_rgba_fetch = NULL; -util_format_dxtn_pack_t util_format_dxtn_pack = util_format_dxtn_pack_stub; +util_format_dxtn_pack_t util_format_dxtn_pack = NULL; -static void -nop(void) -{} -#define is_nop(f) ((void*)(f) == (void*)nop) - -static util_dl_proc -get_proc_address_or_nop(struct util_dl_library *library, - const char *procname) +void +util_format_s3tc_init(void) { - if(library) { - util_dl_proc proc = util_dl_get_proc_address(library, procname); - if(proc) - return proc; - } - return (util_dl_proc)nop; -} - -void -util_format_s3tc_do_init(void) -{ - struct util_dl_library *library; - - library = util_dl_open(DXTN_LIBNAME); - util_format_dxt1_rgb_fetch = (util_format_dxtn_fetch_t) - get_proc_address_or_nop(library, "fetch_2d_texel_rgb_dxt1"); - util_format_dxt1_rgba_fetch = (util_format_dxtn_fetch_t) - get_proc_address_or_nop(library, "fetch_2d_texel_rgba_dxt1"); - util_format_dxt3_rgba_fetch = (util_format_dxtn_fetch_t) - get_proc_address_or_nop(library, "fetch_2d_texel_rgba_dxt3"); - util_format_dxt5_rgba_fetch = (util_format_dxtn_fetch_t) - get_proc_address_or_nop(library, "fetch_2d_texel_rgba_dxt5"); - util_format_dxtn_pack = (util_format_dxtn_pack_t) - get_proc_address_or_nop(library, "tx_compress_dxtn"); - - if (!library) - debug_printf("couldn't open " DXTN_LIBNAME ", software DXTn " - "compression/decompression unavailable\n"); - else { - if (!is_nop(util_format_dxt1_rgb_fetch) && - !is_nop(util_format_dxt1_rgba_fetch) && - !is_nop(util_format_dxt3_rgba_fetch) && - !is_nop(util_format_dxt5_rgba_fetch) && - !is_nop(util_format_dxtn_pack)) { - debug_printf("software DXTn compression/decompression available\n"); - } else - debug_printf("couldn't reference all symbols in " - DXTN_LIBNAME ", software DXTn compression/decompression " - "unavailable or partially available\n"); - } + static struct util_dl_library * + library = NULL; -#define DO(n, a, A) \ - ((struct util_format_description *)util_format_description(PIPE_FORMAT_DXT##n##_SRGB##A))->is_supported = \ - ((struct util_format_description *)util_format_description(PIPE_FORMAT_DXT##n##_RGB##A))->is_supported = \ - !is_nop(util_format_dxt##n##_rgb##a##_fetch); + if (util_format_s3tc_enabled) + return; - DO(1,,); - DO(1,a,A); - DO(3,a,A); - DO(5,a,A); - -#undef DO + if (!library) { + library = util_dl_open(DXTN_LIBNAME); + if (!library) { + debug_printf("couldn't open " DXTN_LIBNAME ", software DXTn " + "compression/decompression unavailable"); + } + else { + util_format_dxt1_rgb_fetch = (util_format_dxtn_fetch_t) + util_dl_get_proc_address(library, "fetch_2d_texel_rgb_dxt1"); + util_format_dxt1_rgba_fetch = (util_format_dxtn_fetch_t) + util_dl_get_proc_address(library, "fetch_2d_texel_rgba_dxt1"); + util_format_dxt3_rgba_fetch = (util_format_dxtn_fetch_t) + util_dl_get_proc_address(library, "fetch_2d_texel_rgba_dxt3"); + util_format_dxt5_rgba_fetch = (util_format_dxtn_fetch_t) + util_dl_get_proc_address(library, "fetch_2d_texel_rgba_dxt5"); + util_format_dxtn_pack = (util_format_dxtn_pack_t) + util_dl_get_proc_address(library, "tx_compress_dxtn"); + + if (util_format_dxt1_rgb_fetch || + util_format_dxt1_rgba_fetch || + util_format_dxt3_rgba_fetch || + util_format_dxt5_rgba_fetch || + util_format_dxtn_pack) { + util_format_s3tc_enabled = TRUE; + debug_printf("software DXTn compression/decompression available"); + + } else { + debug_printf("couldn't reference all symbols in " + DXTN_LIBNAME ", software DXTn compression/decompression " + "unavailable"); + } + } + } } @@ -167,69 +97,85 @@ util_format_s3tc_do_init(void) void util_format_dxt1_rgb_fetch_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) { - util_format_dxt1_rgb_fetch(0, src, i, j, dst); + if (util_format_dxt1_rgb_fetch) { + util_format_dxt1_rgb_fetch(0, src, i, j, dst); + } } void util_format_dxt1_rgba_fetch_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) { - util_format_dxt1_rgba_fetch(0, src, i, j, dst); + if (util_format_dxt1_rgba_fetch) { + util_format_dxt1_rgba_fetch(0, src, i, j, dst); + } } void util_format_dxt3_rgba_fetch_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) { - util_format_dxt3_rgba_fetch(0, src, i, j, dst); + if (util_format_dxt3_rgba_fetch) { + util_format_dxt3_rgba_fetch(0, src, i, j, dst); + } } void util_format_dxt5_rgba_fetch_8unorm(uint8_t *dst, const uint8_t *src, unsigned i, unsigned j) { - util_format_dxt5_rgba_fetch(0, src, i, j, dst); + if (util_format_dxt5_rgba_fetch) { + util_format_dxt5_rgba_fetch(0, src, i, j, dst); + } } void util_format_dxt1_rgb_fetch_float(float *dst, const uint8_t *src, unsigned i, unsigned j) { - uint8_t tmp[4]; - util_format_dxt1_rgb_fetch(0, src, i, j, tmp); - dst[0] = ubyte_to_float(tmp[0]); - dst[1] = ubyte_to_float(tmp[1]); - dst[2] = ubyte_to_float(tmp[2]); - dst[3] = 1.0; + if (util_format_dxt1_rgb_fetch) { + uint8_t tmp[4]; + util_format_dxt1_rgb_fetch(0, src, i, j, tmp); + dst[0] = ubyte_to_float(tmp[0]); + dst[1] = ubyte_to_float(tmp[1]); + dst[2] = ubyte_to_float(tmp[2]); + dst[3] = 1.0; + } } void util_format_dxt1_rgba_fetch_float(float *dst, const uint8_t *src, unsigned i, unsigned j) { - uint8_t tmp[4]; - util_format_dxt1_rgba_fetch(0, src, i, j, tmp); - dst[0] = ubyte_to_float(tmp[0]); - dst[1] = ubyte_to_float(tmp[1]); - dst[2] = ubyte_to_float(tmp[2]); - dst[3] = ubyte_to_float(tmp[3]); + if (util_format_dxt1_rgba_fetch) { + uint8_t tmp[4]; + util_format_dxt1_rgba_fetch(0, src, i, j, tmp); + dst[0] = ubyte_to_float(tmp[0]); + dst[1] = ubyte_to_float(tmp[1]); + dst[2] = ubyte_to_float(tmp[2]); + dst[3] = ubyte_to_float(tmp[3]); + } } void util_format_dxt3_rgba_fetch_float(float *dst, const uint8_t *src, unsigned i, unsigned j) { - uint8_t tmp[4]; - util_format_dxt3_rgba_fetch(0, src, i, j, tmp); - dst[0] = ubyte_to_float(tmp[0]); - dst[1] = ubyte_to_float(tmp[1]); - dst[2] = ubyte_to_float(tmp[2]); - dst[3] = ubyte_to_float(tmp[3]); + if (util_format_dxt3_rgba_fetch) { + uint8_t tmp[4]; + util_format_dxt3_rgba_fetch(0, src, i, j, tmp); + dst[0] = ubyte_to_float(tmp[0]); + dst[1] = ubyte_to_float(tmp[1]); + dst[2] = ubyte_to_float(tmp[2]); + dst[3] = ubyte_to_float(tmp[3]); + } } void util_format_dxt5_rgba_fetch_float(float *dst, const uint8_t *src, unsigned i, unsigned j) { - uint8_t tmp[4]; - util_format_dxt5_rgba_fetch(0, src, i, j, tmp); - dst[0] = ubyte_to_float(tmp[0]); - dst[1] = ubyte_to_float(tmp[1]); - dst[2] = ubyte_to_float(tmp[2]); - dst[3] = ubyte_to_float(tmp[3]); + if (util_format_dxt5_rgba_fetch) { + uint8_t tmp[4]; + util_format_dxt5_rgba_fetch(0, src, i, j, tmp); + dst[0] = ubyte_to_float(tmp[0]); + dst[1] = ubyte_to_float(tmp[1]); + dst[2] = ubyte_to_float(tmp[2]); + dst[3] = ubyte_to_float(tmp[3]); + } } @@ -240,7 +186,7 @@ util_format_dxt5_rgba_fetch_float(float *dst, const uint8_t *src, unsigned i, un void util_format_dxt1_rgb_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt1_rgb_fetch)) { + if (util_format_dxt1_rgb_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -261,7 +207,7 @@ util_format_dxt1_rgb_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const void util_format_dxt1_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt1_rgba_fetch)) { + if (util_format_dxt1_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -282,7 +228,7 @@ util_format_dxt1_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const void util_format_dxt3_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt3_rgba_fetch)) { + if (util_format_dxt3_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -303,7 +249,7 @@ util_format_dxt3_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const void util_format_dxt5_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (is_nop(util_format_dxt5_rgba_fetch)) { + if (util_format_dxt5_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -324,7 +270,7 @@ util_format_dxt5_rgba_unpack_8unorm(uint8_t *dst_row, unsigned dst_stride, const void util_format_dxt1_rgb_unpack_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (is_nop(util_format_dxt1_rgb_fetch)) { + if (util_format_dxt1_rgb_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -350,7 +296,7 @@ util_format_dxt1_rgb_unpack_float(float *dst_row, unsigned dst_stride, const uin void util_format_dxt1_rgba_unpack_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt1_rgba_fetch)) { + if (util_format_dxt1_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -376,7 +322,7 @@ util_format_dxt1_rgba_unpack_float(float *dst_row, unsigned dst_stride, const ui void util_format_dxt3_rgba_unpack_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt3_rgba_fetch)) { + if (util_format_dxt3_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -402,7 +348,7 @@ util_format_dxt3_rgba_unpack_float(float *dst_row, unsigned dst_stride, const ui void util_format_dxt5_rgba_unpack_float(float *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxt5_rgba_fetch)) { + if (util_format_dxt5_rgba_fetch) { unsigned x, y, i, j; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -433,7 +379,7 @@ util_format_dxt5_rgba_unpack_float(float *dst_row, unsigned dst_stride, const ui void util_format_dxt1_rgb_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -460,7 +406,7 @@ util_format_dxt1_rgb_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const ui void util_format_dxt1_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -487,7 +433,7 @@ util_format_dxt1_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const u void util_format_dxt3_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -514,7 +460,7 @@ util_format_dxt3_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const u void util_format_dxt5_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const uint8_t *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const uint8_t *src = src_row; @@ -541,7 +487,7 @@ util_format_dxt5_rgba_pack_8unorm(uint8_t *dst_row, unsigned dst_stride, const u void util_format_dxt1_rgb_pack_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const float *src = src_row; @@ -568,7 +514,7 @@ util_format_dxt1_rgb_pack_float(uint8_t *dst_row, unsigned dst_stride, const flo void util_format_dxt1_rgba_pack_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const float *src = src_row; @@ -595,7 +541,7 @@ util_format_dxt1_rgba_pack_float(uint8_t *dst_row, unsigned dst_stride, const fl void util_format_dxt3_rgba_pack_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const float *src = src_row; @@ -622,7 +568,7 @@ util_format_dxt3_rgba_pack_float(uint8_t *dst_row, unsigned dst_stride, const fl void util_format_dxt5_rgba_pack_float(uint8_t *dst_row, unsigned dst_stride, const float *src_row, unsigned src_stride, unsigned width, unsigned height) { - if (!is_nop(util_format_dxtn_pack)) { + if (util_format_dxtn_pack) { unsigned x, y, i, j, k; for(y = 0; y < height; y += 4) { const float *src = src_row; diff --git a/src/gallium/auxiliary/util/u_format_s3tc.h b/src/gallium/auxiliary/util/u_format_s3tc.h index da14b9b93a6..5c3a9dd22c7 100644 --- a/src/gallium/auxiliary/util/u_format_s3tc.h +++ b/src/gallium/auxiliary/util/u_format_s3tc.h @@ -31,7 +31,6 @@ #include "pipe/p_compiler.h" -#include "util/u_inline_init.h" enum util_format_dxtn { @@ -66,7 +65,8 @@ extern util_format_dxtn_fetch_t util_format_dxt5_rgba_fetch; extern util_format_dxtn_pack_t util_format_dxtn_pack; -UTIL_INLINE_INIT(util_format_s3tc) +void +util_format_s3tc_init(void); void diff --git a/src/gallium/auxiliary/util/u_format_table.py b/src/gallium/auxiliary/util/u_format_table.py index 2c0c9bffeed..94a4331b15f 100755 --- a/src/gallium/auxiliary/util/u_format_table.py +++ b/src/gallium/auxiliary/util/u_format_table.py @@ -92,7 +92,7 @@ def write_format_table(formats): u_format_pack.generate(formats) for format in formats: - print 'struct util_format_description' + print 'const struct util_format_description' print 'util_format_%s_description = {' % (format.short_name(),) print " %s," % (format.name,) print " \"%s\"," % (format.name,) @@ -103,7 +103,6 @@ def write_format_table(formats): print " %s,\t/* is_array */" % (bool_map(format.is_array()),) print " %s,\t/* is_bitmask */" % (bool_map(format.is_bitmask()),) print " %s,\t/* is_mixed */" % (bool_map(format.is_mixed()),) - print " %s,\t/* is_supported */" % ("TRUE" if u_format_pack.is_format_supported(format) else "FALSE",) print " {" for i in range(4): channel = format.channels[i] diff --git a/src/gallium/auxiliary/util/u_inline_init.h b/src/gallium/auxiliary/util/u_inline_init.h deleted file mode 100644 index 2a1e775ed81..00000000000 --- a/src/gallium/auxiliary/util/u_inline_init.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef U_INLINE_INIT_H_ -#define U_INLINE_INIT_H_ - -#define UTIL_INLINE_INIT(m) \ - extern boolean m##_inited; \ - extern void m##_do_init(void); \ - static INLINE void m##_init(void) \ - { \ - if(!m##_inited) { \ - m##_do_init(); \ - m##_inited = TRUE; \ - } \ - } - -#endif /* U_INLINE_INIT_H_ */ diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 92b194a8f82..aa14e17872d 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -22,7 +22,6 @@ #include "draw/draw_context.h" #include "pipe/p_defines.h" -#include "util/u_format.h" #include "nv50_context.h" #include "nv50_screen.h" diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index ddc53b336fb..be64048abfc 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -27,7 +27,6 @@ #include "util/u_memory.h" -#include "util/u_format.h" #include "util/u_format_s3tc.h" #include "pipe/p_defines.h" #include "pipe/p_screen.h" @@ -156,9 +155,25 @@ softpipe_is_format_supported( struct pipe_screen *screen, target == PIPE_TEXTURE_3D || target == PIPE_TEXTURE_CUBE); - if(!util_format_is_supported(format)) + switch(format) { + case PIPE_FORMAT_YUYV: + case PIPE_FORMAT_UYVY: return FALSE; + case PIPE_FORMAT_DXT1_RGB: + case PIPE_FORMAT_DXT1_RGBA: + case PIPE_FORMAT_DXT3_RGBA: + case PIPE_FORMAT_DXT5_RGBA: + return util_format_s3tc_enabled; + + case PIPE_FORMAT_Z32_FLOAT: + case PIPE_FORMAT_NONE: + return FALSE; + + default: + break; + } + if(tex_usage & (PIPE_TEXTURE_USAGE_DISPLAY_TARGET | PIPE_TEXTURE_USAGE_SCANOUT | PIPE_TEXTURE_USAGE_SHARED)) { @@ -166,6 +181,8 @@ softpipe_is_format_supported( struct pipe_screen *screen, return FALSE; } + /* XXX: this is often a lie. Pull in logic from llvmpipe to fix. + */ return TRUE; } @@ -224,6 +241,8 @@ softpipe_create_screen(struct sw_winsys *winsys) screen->base.context_create = softpipe_create_context; screen->base.flush_frontbuffer = softpipe_flush_frontbuffer; + util_format_s3tc_init(); + softpipe_init_screen_texture_funcs(&screen->base); softpipe_init_screen_buffer_funcs(&screen->base); softpipe_init_screen_fence_funcs(&screen->base); |