[Bf-blender-cvs] [c1ca3c8038d] master: Cycles: fixed the SM_2x CUDA kernel build that I broke in my previous commit
Stefan Werner
noreply at git.blender.org
Thu Jul 20 13:28:43 CEST 2017
Commit: c1ca3c8038d38c33365e4034ec024dbde73907a2
Author: Stefan Werner
Date: Thu Jul 20 13:28:34 2017 +0200
Branches: master
https://developer.blender.org/rBc1ca3c8038d38c33365e4034ec024dbde73907a2
Cycles: fixed the SM_2x CUDA kernel build that I broke in my previous commit
===================================================================
M intern/cycles/kernel/kernel_textures.h
M intern/cycles/kernel/svm/svm_image.h
===================================================================
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);
More information about the Bf-blender-cvs
mailing list