On 24.11.2015 01:21, Ilia Mirkin wrote:
> Module: Mesa
> Branch: master
> Commit: 1c7d0a6aa4f5cb38af7e281e1e5437cd1a20f781
> URL:
> http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c7d0a6aa4f5cb38af7e281e1e5437cd1a20f781
>
> Author: Ilia Mirkin <imir...@alum.mit.edu>
> Date: Sat Nov 21 10:44:00 2015 -0500
>
> gallium/util: remove the fake format helpers for bptc and etc2
>
> This was a silly hack that kept growing and growing. Instead, just write
> NULLs for those functions. No need to have helpers that just assert(0)
> when you call them.
>
> Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
> Reviewed-by: Marek Olšák <marek.ol...@amd.com>
> Reviewed-by: Roland Scheidegger <srol...@vmware.com>
This change broke make check, specifically llvmpipe's lp_test_format:
lp_test_format:
../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c:732:
lp_build_fetch_rgba_aos: Assertion `0' failed.
Program received signal SIGABRT, Aborted.
0x00007ffff460f107 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:56
56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory.
(gdb) bt
#0 0x00007ffff460f107 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:56
#1 0x00007ffff46104e8 in __GI_abort () at abort.c:89
#2 0x00007ffff4608226 in __assert_fail_base (fmt=0x7ffff473ed08 "%s%s%s:%u:
%s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x5703cb "0",
file=file@entry=0x573748
"../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c",
line=line@entry=732,
function=function@entry=0x5739f0 <__PRETTY_FUNCTION__.10335>
"lp_build_fetch_rgba_aos") at assert.c:92
#3 0x00007ffff46082d2 in __GI___assert_fail
(assertion=assertion@entry=0x5703cb "0", file=file@entry=0x573748
"../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c",
line=line@entry=732,
function=0x5739f0 <__PRETTY_FUNCTION__.10335> "lp_build_fetch_rgba_aos") at
assert.c:101
#4 0x00000000004dcd20 in lp_build_fetch_rgba_aos
(gallivm=gallivm@entry=0x80ae40, format_desc=format_desc@entry=0x79b500
<util_format_bptc_rgba_unorm_description>, type=..., type@entry=...,
aligned=aligned@entry=1 '\001', base_ptr=base_ptr@entry=0x83d430,
offset=offset@entry=0x818330, i=0x833050, j=0x8326c0, cache=0x821790) at
../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c:732
#5 0x0000000000405d3e in add_fetch_rgba_test (gallivm=gallivm@entry=0x80ae40,
desc=desc@entry=0x79b500 <util_format_bptc_rgba_unorm_description>, type=...,
verbose=0) at ../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:124
#6 0x0000000000405eaf in test_format_float (verbose=0, desc=0x79b500
<util_format_bptc_rgba_unorm_description>, fp=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:153
#7 test_one (verbose=0, format_desc=0x79b500
<util_format_bptc_rgba_unorm_description>, fp=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:336
#8 test_all (verbose=verbose@entry=0, fp=fp@entry=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:385
#9 0x0000000000406c8a in test_some (verbose=verbose@entry=0, fp=fp@entry=0x0,
n=n@entry=1000) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:401
#10 0x0000000000405a33 in main (argc=1, argv=0x7fffffffe708) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_main.c:410
(gdb) bt full
#0 0x00007ffff460f107 in __GI_raise (sig=sig@entry=6) at
../nptl/sysdeps/unix/sysv/linux/raise.c:56
resultvar = 0
pid = 22140
selftid = 22140
#1 0x00007ffff46104e8 in __GI_abort () at abort.c:89
save_stage = 2
act = {__sigaction_handler = {sa_handler = 0x7fffffffea42, sa_sigaction
= 0x7fffffffea42}, sa_mask = {__val = {140737294610881, 5715784, 732, 4,
140737488347168, 128849010864, 140737322476013, 4294967296, 0, 0, 0,
21474836480, 140737294610407,
140737488347320, 140737354092544, 140737294626056}}, sa_flags =
5702603, sa_restorer = 0x5739f0 <__PRETTY_FUNCTION__.10335>}
sigs = {__val = {32, 0 <repeats 15 times>}}
#2 0x00007ffff4608226 in __assert_fail_base (fmt=0x7ffff473ed08 "%s%s%s:%u:
%s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x5703cb "0",
file=file@entry=0x573748
"../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c",
line=line@entry=732,
function=function@entry=0x5739f0 <__PRETTY_FUNCTION__.10335>
"lp_build_fetch_rgba_aos") at assert.c:92
str = 0x868eb0 "\260\065\213"
total = 4096
#3 0x00007ffff46082d2 in __GI___assert_fail
(assertion=assertion@entry=0x5703cb "0", file=file@entry=0x573748
"../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c",
line=line@entry=732,
function=0x5739f0 <__PRETTY_FUNCTION__.10335> "lp_build_fetch_rgba_aos") at
assert.c:101
No locals.
#4 0x00000000004dcd20 in lp_build_fetch_rgba_aos
(gallivm=gallivm@entry=0x80ae40, format_desc=format_desc@entry=0x79b500
<util_format_bptc_rgba_unorm_description>, type=..., type@entry=...,
aligned=aligned@entry=1 '\001', base_ptr=base_ptr@entry=0x83d430,
offset=offset@entry=0x818330, i=0x833050, j=0x8326c0, cache=0x821790) at
../../../../src/gallium/auxiliary/gallivm/lp_bld_format_aos.c:732
builder = 0x8ceec0
num_pixels = 1
bld = {gallivm = 0x80ae40, type = {floating = 1, fixed = 0, sign = 1,
norm = 0, width = 32, length = 4}, elem_type = 0x809f18, vec_type = 0x818980,
int_elem_type = 0x80a020, int_vec_type = 0x818b10, undef = 0x81b4a0, zero =
0x81b8e0, one = 0x81c270}
__PRETTY_FUNCTION__ = "lp_build_fetch_rgba_aos"
__func__ = "lp_build_fetch_rgba_aos"
#5 0x0000000000405d3e in add_fetch_rgba_test (gallivm=gallivm@entry=0x80ae40,
desc=desc@entry=0x79b500 <util_format_bptc_rgba_unorm_description>, type=...,
verbose=0) at ../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:124
name =
"fetch_bptc_rgba_unorm_float\000\000\000\000\000\310=\204\000\000\000\000\000\300\357\200\000\000\000\000\000\000ބ\000\000\000\000\000\200;\204\000\000\000\000\000\000\000\000\000\001\000\000\000\300ڄ\000\000\000\000\000@݄\000\000\000\000\000\300\357\200",
'\000' <repeats 13 times>,
"r\371\264\365\377\177\000\000\000\000\000\000\000\000\000\000xH\201\000\000\000\000\000\220\344\377\377\377\177\000\000\064w\006\366\377\177\000\000\300ڄ\000\000\000\000\000@\344\377\377\377\177\000\000p?\201\000\000\000\000\000
֗\364\377\177\000\000\340\311\002\000\000\000\000\000H\000\000\000\000\000\000\000
\006\216\000\000\000\000\000\000\265y\000\000\000\000\000"...
context = <optimized out>
module = <optimized out>
builder = 0x8ceec0
args = {0x8189b0, 0x8189d0, 0x80a020, 0x80a020, 0x818a80}
func = 0x8b3788
packed_ptr = 0x83d430
offset = 0x818330
rgba_ptr = 0x897d60
i = 0x833050
j = 0x8326c0
block = <optimized out>
rgba = <optimized out>
cache = 0x821790
#6 0x0000000000405eaf in test_format_float (verbose=0, desc=0x79b500
<util_format_bptc_rgba_unorm_description>, fp=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:153
fetch = 0x0
first = 1 '\001'
j = <optimized out>
k = <optimized out>
gallivm = 0x80ae40
fetch_ptr = <optimized out>
packed = "\377\377\377\377", '\000' <repeats 11 times>
unpacked = {1.47009241e-39, 0, 0, 0}
success = 1 '\001'
i = <optimized out>
l = <optimized out>
#7 test_one (verbose=0, format_desc=0x79b500
<util_format_bptc_rgba_unorm_description>, fp=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:336
success = 1 '\001'
#8 test_all (verbose=verbose@entry=0, fp=fp@entry=0x0) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:385
format_desc = 0x79b500 <util_format_bptc_rgba_unorm_description>
format = PIPE_FORMAT_BPTC_RGBA_UNORM
success = 1 '\001'
#9 0x0000000000406c8a in test_some (verbose=verbose@entry=0, fp=fp@entry=0x0,
n=n@entry=1000) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_format.c:401
No locals.
#10 0x0000000000405a33 in main (argc=1, argv=0x7fffffffe708) at
../../../../../src/gallium/drivers/llvmpipe/lp_test_main.c:410
verbose = <optimized out>
fp = <optimized out>
n = <optimized out>
i = <optimized out>
success = <optimized out>
single = <optimized out>
fpstate = <optimized out>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
