gallivm: Do not do mipfiltering when magnifying.

If lod < 0, then invariably follows that ilevel0 == ilevel1 == 0.

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
index 8a55681166dd9eb280f9a95bf98f8627f54fc196..d42b5f612710c9d064498934e6c7788d096b9c8c 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
@@ -1071,14 +1071,14 @@ lp_build_sample_aos(struct lp_build_sample_context *bld,
       lp_build_else(&if_ctx);
       {
          /* Use the magnification filter */
-         lp_build_sample_mipmap(bld, mag_filter, mip_filter,
-                                s, t, r, lod_fpart,
-                                width0_vec, width1_vec,
-                                height0_vec, height1_vec,
-                                depth0_vec, depth1_vec,
-                                row_stride0_vec, row_stride1_vec,
-                                img_stride0_vec, img_stride1_vec,
-                                data_ptr0, data_ptr1,
+         lp_build_sample_mipmap(bld, mag_filter, PIPE_TEX_MIPFILTER_NONE,
+                                s, t, r, NULL,
+                                width_vec, NULL,
+                                height_vec, NULL,
+                                depth_vec, NULL,
+                                row_stride0_vec, NULL,
+                                img_stride0_vec, NULL,
+                                data_ptr0, NULL,
                                 &packed_lo, &packed_hi);
       }
       lp_build_endif(&if_ctx);

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index 74362abf45513ce80a179d6a8114968818657fd6..c7947f06e816019bacf54f82a2b2e3b498ebc8e2 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -1044,14 +1044,14 @@ lp_build_sample_general(struct lp_build_sample_context *bld,
       {
          /* Use the magnification filter */
          lp_build_sample_mipmap(bld, unit,
-                                mag_filter, mip_filter,
-                                s, t, r, lod_fpart,
-                                width0_vec, width1_vec,
-                                height0_vec, height1_vec,
-                                depth0_vec, depth1_vec,
-                                row_stride0_vec, row_stride1_vec,
-                                img_stride0_vec, img_stride1_vec,
-                                data_ptr0, data_ptr1,
+                                mag_filter, PIPE_TEX_MIPFILTER_NONE,
+                                s, t, r, NULL,
+                                width_vec, NULL,
+                                height_vec, NULL,
+                                depth_vec, NULL,
+                                row_stride0_vec, NULL,
+                                img_stride0_vec, NULL,
+                                data_ptr0, NULL,
                                 colors_out);
       }
       lp_build_endif(&if_ctx);