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

Cycles: fixed the SM_2x CUDA kernel build that I broke in my previous commit

Browse Source
This commit is contained in:
Stefan Werner
2017-07-20 13:28:34 +02:00
parent 4bc6faf9c8
commit c1ca3c8038
2 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/kernel/kernel_textures.h
View File

@@ -180,7 +180,6 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_641)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_649) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_649)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_657) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_657)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_665) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_665)
KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_673)
# else # else
/* bindless textures */ /* bindless textures */

1
intern/cycles/kernel/svm/svm_image.h
View File

@@ -125,7 +125,6 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
case 649: r = kernel_tex_image_interp(__tex_image_byte4_649, x, y); break; case 649: r = kernel_tex_image_interp(__tex_image_byte4_649, x, y); break;
case 657: r = kernel_tex_image_interp(__tex_image_byte4_657, x, y); break; case 657: r = kernel_tex_image_interp(__tex_image_byte4_657, x, y); break;
case 665: r = kernel_tex_image_interp(__tex_image_byte4_665, x, y); break; case 665: r = kernel_tex_image_interp(__tex_image_byte4_665, x, y); break;
case 673: r = kernel_tex_image_interp(__tex_image_byte4_673, x, y); break;
default: default:
kernel_assert(0); kernel_assert(0);
return make_float4(0.0f, 0.0f, 0.0f, 0.0f); return make_float4(0.0f, 0.0f, 0.0f, 0.0f);