diff options
| author | Roland Scheidegger <[email protected]> | 2013-07-05 01:18:24 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2013-07-05 01:19:23 +0200 |
| commit | 4dbca8672bd357bb036dd40c4d8b8a4dc459abcb (patch) | |
| tree | 45e702881793fc7fbda2e29f0d24496521d307a3 | |
| parent | f3bbf65929e395360e5565d08d015977dd5b79fa (diff) | |
gallivm: (trivial) fix bogus assertion for per-element lod with 1d resources
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).
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c index c2efec9f4cd..573a2d00bbf 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c @@ -1121,7 +1121,7 @@ lp_build_mipmap_level_sizes(struct lp_build_sample_context *bld, */ assert(bld->num_lods == bld->coord_bld.type.length); 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, bld->int_size); /* vector shift with variable shift count alert... */ diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index 53e3628f56e..4b5674197f0 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -1306,7 +1306,6 @@ lp_build_fetch_texel(struct lp_build_sample_context *bld, LLVMValueRef width, height, depth, i, j; 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 (bld->num_lods != int_coord_bld->type.length) { ilevel = lp_build_pack_aos_scalars(bld->gallivm, int_coord_bld->type, |