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).

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
index c2efec9f4cd7cf39b6c683e2cd3a9e17466c2553..573a2d00bbf7d15e28a9f6a5b65170d6f8ce2df7 100644 (file)
--- 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 53e3628f56e911b963807a9f58bf35c1ca636ea6..4b5674197f094d436686899011964a1bfcc4f609 100644 (file)
--- 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,