blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 738 Projects 19 Wiki Activity

Cycles: Correction to image extension type commits 

Clipping wasn't working totally correct, need to check original coordinates,
not the integer ones,

Now CPU gives the same exact results for both SVM and OSL, CUDA is still doing
something crazy with edges.
This commit is contained in:
Sergey Sharybin 2015-07-28 16:31:27 +02:00
parent 971affb436
commit a6b2650c7d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/kernel_compat_cpu.h
View File

@ -144,7 +144,7 @@ template<typename T> struct texture_image {
iy = wrap_periodic(iy, height);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */
@ -168,7 +168,7 @@ template<typename T> struct texture_image {
niy = wrap_periodic(iy+1, height);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */
@ -208,7 +208,7 @@ template<typename T> struct texture_image {
nniy = wrap_periodic(iy+2, height);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */
@ -279,7 +279,7 @@ template<typename T> struct texture_image {
iz = wrap_periodic(iz, depth);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */
@ -308,7 +308,7 @@ template<typename T> struct texture_image {
niz = wrap_periodic(iz+1, depth);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */
@ -363,7 +363,7 @@ template<typename T> struct texture_image {
nniz = wrap_periodic(iz+2, depth);
break;
case EXTENSION_CLIP:
if (ix < 0 || iy < 0 || ix >= width || iy >= height) {
if (x < 0.0f || y < 0.0f || x >= width || y >= height) {
return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
/* Fall through. */