summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-10-08 10:54:23 +0100
committerJosé Fonseca <jfonseca@vmware.com>2010-10-08 14:06:37 +0100
commit4eb222a3e654812ac1466b438a7d43f07ca6a508 (patch)
tree0731586d01ca72b01924d967c5fb2f1d05e32331 /src
parent1f01f5cfcf6bb30d8c1d616019cbeb9700cd1e80 (diff)
gallivm: Do not do mipfiltering when magnifying.
If lod < 0, then invariably follows that ilevel0 == ilevel1 == 0.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c16
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c16
2 files changed, 16 insertions, 16 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
index 8a55681166..d42b5f6127 100644
--- 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 74362abf45..c7947f06e8 100644
--- 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);