fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallivm: (trivial) fix bogus assertion for per-element lod with 1d resources

Browse source 
The assertion was always broken but the code unused until enabling the
per-element lod code. Fixes piglit texelFetch vs isampler1D and similar
tests (only run with GL 3.0 version override).
This commit is contained in:
Roland Scheidegger 2013-07-05 01:18:24 +02:00
parent f3bbf65929
commit 4dbca8672b
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/gallivm/lp_bld_sample.c
View file

@ -1121,7 +1121,7 @@ lp_build_mipmap_level_sizes(struct lp_build_sample_context *bld,
*/ */
assert(bld->num_lods == bld->coord_bld.type.length); assert(bld->num_lods == bld->coord_bld.type.length);
if (bld->dims == 1) { if (bld->dims == 1) {
assert(bld->int_size_bld.type.length == 1); assert(bld->int_size_in_bld.type.length == 1);
int_size_vec = lp_build_broadcast_scalar(&bld->int_coord_bld, int_size_vec = lp_build_broadcast_scalar(&bld->int_coord_bld,
bld->int_size); bld->int_size);
/* vector shift with variable shift count alert... */ /* vector shift with variable shift count alert... */

1
src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
View file

@ -1306,7 +1306,6 @@ lp_build_fetch_texel(struct lp_build_sample_context *bld,
LLVMValueRef width, height, depth, i, j; LLVMValueRef width, height, depth, i, j;
LLVMValueRef offset, out_of_bounds, out1; LLVMValueRef offset, out_of_bounds, out1;
/* XXX just like ordinary sampling, we don't handle per-pixel lod (yet). */
if (explicit_lod && bld->static_texture_state->target != PIPE_BUFFER) { if (explicit_lod && bld->static_texture_state->target != PIPE_BUFFER) {
if (bld->num_lods != int_coord_bld->type.length) { if (bld->num_lods != int_coord_bld->type.length) {
ilevel = lp_build_pack_aos_scalars(bld->gallivm, int_coord_bld->type, ilevel = lp_build_pack_aos_scalars(bld->gallivm, int_coord_bld->type,