AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallivm: Add and use lp_build_lerp_3d.

Browse Source 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
José Fonseca
2013-04-17 18:03:11 +01:00
parent e230d9debb
commit 5aaa4bafe0
3 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/gallivm/lp_bld_arit.c
+20
View File
@@ -1095,6 +1095,26 @@ lp_build_lerp_2d(struct lp_build_context *bld,
}
LLVMValueRef
lp_build_lerp_3d(struct lp_build_context *bld,
LLVMValueRef x,
LLVMValueRef y,
LLVMValueRef z,
LLVMValueRef v000,
LLVMValueRef v001,
LLVMValueRef v010,
LLVMValueRef v011,
LLVMValueRef v100,
LLVMValueRef v101,
LLVMValueRef v110,
LLVMValueRef v111)
{
LLVMValueRef v0 = lp_build_lerp_2d(bld, x, y, v000, v001, v010, v011);
LLVMValueRef v1 = lp_build_lerp_2d(bld, x, y, v100, v101, v110, v111);
return lp_build_lerp(bld, z, v0, v1);
}
/**
* Generate min(a, b)
* Do checks for special cases.
src/gallium/auxiliary/gallivm/lp_bld_arit.h
+15
View File
@@ -105,6 +105,21 @@ lp_build_lerp_2d(struct lp_build_context *bld,
LLVMValueRef v10,
LLVMValueRef v11);
LLVMValueRef
lp_build_lerp_3d(struct lp_build_context *bld,
LLVMValueRef x,
LLVMValueRef y,
LLVMValueRef z,
LLVMValueRef v000,
LLVMValueRef v001,
LLVMValueRef v010,
LLVMValueRef v011,
LLVMValueRef v100,
LLVMValueRef v101,
LLVMValueRef v110,
LLVMValueRef v111);
LLVMValueRef
lp_build_min(struct lp_build_context *bld,
LLVMValueRef a,
src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
+24 -25
View File
@@ -982,8 +982,7 @@ lp_build_sample_fetch_image_linear(struct lp_build_sample_context *bld,
s_fpart_hi,
neighbors_hi[0][0][0],
neighbors_hi[0][0][1]);
}
else {
} else if (dims == 2) {
/* 2-D lerp */
packed_lo = lp_build_lerp_2d(&h16,
s_fpart_lo, t_fpart_lo,
@@ -998,30 +997,30 @@ lp_build_sample_fetch_image_linear(struct lp_build_sample_context *bld,
neighbors_hi[0][0][1],
neighbors_hi[0][1][0],
neighbors_hi[0][1][1]);
} else {
/* 3-D lerp */
assert(dims == 3);
packed_lo = lp_build_lerp_3d(&h16,
s_fpart_lo, t_fpart_lo, r_fpart_lo,
neighbors_lo[0][0][0],
neighbors_lo[0][0][1],
neighbors_lo[0][1][0],
neighbors_lo[0][1][1],
neighbors_lo[1][0][0],
neighbors_lo[1][0][1],
neighbors_lo[1][1][0],
neighbors_lo[1][1][1]);
if (dims >= 3) {
LLVMValueRef packed_lo2, packed_hi2;
/* lerp in the second z slice */
packed_lo2 = lp_build_lerp_2d(&h16,
s_fpart_lo, t_fpart_lo,
neighbors_lo[1][0][0],
neighbors_lo[1][0][1],
neighbors_lo[1][1][0],
neighbors_lo[1][1][1]);
packed_hi2 = lp_build_lerp_2d(&h16,
s_fpart_hi, t_fpart_hi,
neighbors_hi[1][0][0],
neighbors_hi[1][0][1],
neighbors_hi[1][1][0],
neighbors_hi[1][1][1]);
/* interp between two z slices */
packed_lo = lp_build_lerp(&h16, r_fpart_lo,
packed_lo, packed_lo2);
packed_hi = lp_build_lerp(&h16, r_fpart_hi,
packed_hi, packed_hi2);
}
packed_hi = lp_build_lerp_3d(&h16,
s_fpart_hi, t_fpart_hi, r_fpart_hi,
neighbors_hi[0][0][0],
neighbors_hi[0][0][1],
neighbors_hi[0][1][0],
neighbors_hi[0][1][1],
neighbors_hi[1][0][0],
neighbors_hi[1][0][1],
neighbors_hi[1][1][0],
neighbors_hi[1][1][1]);
}
}