diff options
| author | Stefan Werner <stewreo@gmail.com> | 2017-07-20 14:28:34 +0300 |
|---|---|---|
| committer | Stefan Werner <stewreo@gmail.com> | 2017-07-20 14:28:34 +0300 |
| commit | c1ca3c8038d38c33365e4034ec024dbde73907a2 (patch) | |
| tree | 8a66704240be659ef5dac88072cbd8c1fba72a75 /intern/cycles | |
| parent | 4bc6faf9c838084b23740c8749759f0c0b956c2b (diff) | |
Cycles: fixed the SM_2x CUDA kernel build that I broke in my previous commit
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index e2ad68f5305..aa5b32803a5 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -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_657) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_665) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_byte4_673) # else /* bindless textures */ diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index 0252f2255cf..7be03dcd65a 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -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 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 673: r = kernel_tex_image_interp(__tex_image_byte4_673, x, y); break; default: kernel_assert(0); return make_float4(0.0f, 0.0f, 0.0f, 0.0f); |