Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, split 2D interpolation function

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-07 17:45:37 +01:00
parent 4a734325f7
commit f31fb4a014
1 changed files with 139 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
View File

@@ -83,17 +83,15 @@ template<typename T> struct TextureInterpolator {
return x - (float)i;
}
static ccl_always_inline float4 interp(const TextureInfo& info, float x, float y)
/* ******** 2D interpolation ******** */
static ccl_always_inline float4 interp_closest(const TextureInfo& info,
float x, float y)
{
if(UNLIKELY(!info.data))
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
const T *data = (const T*)info.data;
int width = info.width;
int height = info.height;
int ix, iy, nix, niy;
if(info.interpolation == INTERPOLATION_CLOSEST) {
const int width = info.width;
const int height = info.height;
int ix, iy;
frac(x*(float)width, &ix);
frac(y*(float)height, &iy);
switch(info.extension) {
@@ -116,15 +114,20 @@ template<typename T> struct TextureInterpolator {
}
return read(data[ix + iy*width]);
}
else if(info.interpolation == INTERPOLATION_LINEAR) {
float tx = frac(x*(float)width - 0.5f, &ix);
float ty = frac(y*(float)height - 0.5f, &iy);
static ccl_always_inline float4 interp_linear(const TextureInfo& info,
float x, float y)
{
const T *data = (const T*)info.data;
const int width = info.width;
const int height = info.height;
int ix, iy, nix, niy;
const float tx = frac(x*(float)width - 0.5f, &ix);
const float ty = frac(y*(float)height - 0.5f, &iy);
switch(info.extension) {
case EXTENSION_REPEAT:
ix = wrap_periodic(ix, width);
iy = wrap_periodic(iy, height);
nix = wrap_periodic(ix+1, width);
niy = wrap_periodic(iy+1, height);
break;
@@ -136,7 +139,6 @@ template<typename T> struct TextureInterpolator {
case EXTENSION_EXTEND:
nix = wrap_clamp(ix+1, width);
niy = wrap_clamp(iy+1, height);
ix = wrap_clamp(ix, width);
iy = wrap_clamp(iy, height);
break;
@@ -144,30 +146,31 @@ template<typename T> struct TextureInterpolator {
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
float4 r = (1.0f - ty)*(1.0f - tx)*read(data[ix + iy*width]);
r += (1.0f - ty)*tx*read(data[nix + iy*width]);
r += ty*(1.0f - tx)*read(data[ix + niy*width]);
r += ty*tx*read(data[nix + niy*width]);
return r;
}
else {
/* Bicubic b-spline interpolation. */
float tx = frac(x*(float)width - 0.5f, &ix);
float ty = frac(y*(float)height - 0.5f, &iy);
static ccl_always_inline float4 interp_cubic(const TextureInfo& info,
float x, float y)
{
const T *data = (const T*)info.data;
const int width = info.width;
const int height = info.height;
int ix, iy, nix, niy;
const float tx = frac(x*(float)width - 0.5f, &ix);
const float ty = frac(y*(float)height - 0.5f, &iy);
int pix, piy, nnix, nniy;
switch(info.extension) {
case EXTENSION_REPEAT:
ix = wrap_periodic(ix, width);
iy = wrap_periodic(iy, height);
pix = wrap_periodic(ix-1, width);
piy = wrap_periodic(iy-1, height);
nix = wrap_periodic(ix+1, width);
niy = wrap_periodic(iy+1, height);
nnix = wrap_periodic(ix+2, width);
nniy = wrap_periodic(iy+2, height);
break;
@@ -179,13 +182,10 @@ template<typename T> struct TextureInterpolator {
case EXTENSION_EXTEND:
pix = wrap_clamp(ix-1, width);
piy = wrap_clamp(iy-1, height);
nix = wrap_clamp(ix+1, width);
niy = wrap_clamp(iy+1, height);
nnix = wrap_clamp(ix+2, width);
nniy = wrap_clamp(iy+2, height);
ix = wrap_clamp(ix, width);
iy = wrap_clamp(iy, height);
break;
@@ -193,7 +193,6 @@ template<typename T> struct TextureInterpolator {
kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
const int xc[4] = {pix, ix, nix, nnix};
const int yc[4] = {width * piy,
width * iy,
@@ -215,13 +214,29 @@ template<typename T> struct TextureInterpolator {
/* Actual interpolation. */
return TERM(0) + TERM(1) + TERM(2) + TERM(3);
#undef TERM
#undef DATA
}
static ccl_always_inline float4 interp(const TextureInfo& info, float x, float y)
{
if(UNLIKELY(!info.data)) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
switch(info.interpolation) {
case INTERPOLATION_CLOSEST:
return interp_closest(info, x, y);
case INTERPOLATION_LINEAR:
return interp_linear(info, x, y);
default:
return interp_cubic(info, x, y);
}
}
static ccl_always_inline float4 interp_3d_closest(const TextureInfo& info, float x, float y, float z)
/* ******** 3D interpolation ******** */
static ccl_always_inline float4 interp_3d_closest(const TextureInfo& info,
float x, float y, float z)
{
int width = info.width;
int height = info.height;
@@ -259,7 +274,8 @@ template<typename T> struct TextureInterpolator {
return read(data[ix + iy*width + iz*width*height]);
}
static ccl_always_inline float4 interp_3d_linear(const TextureInfo& info, float x, float y, float z)
static ccl_always_inline float4 interp_3d_linear(const TextureInfo& info,
float x, float y, float z)
{
int width = info.width;
int height = info.height;