[Bf-blender-cvs] [e582b1c] cycles-ptex-49: Ptex+Cuda: update the svm_image_texture switch
Nicholas Bishop
noreply at git.blender.org
Sun Feb 8 18:38:27 CET 2015
Commit: e582b1cf1a33afb0c94693c9702531f121dc0ef7
Author: Nicholas Bishop
Date: Sun Feb 8 18:37:31 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rBe582b1cf1a33afb0c94693c9702531f121dc0ef7
Ptex+Cuda: update the svm_image_texture switch
===================================================================
M intern/cycles/kernel/svm/svm_image.h
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h
index 0e02746..a3c33ae 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -251,9 +251,9 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
case 95: r = kernel_tex_image_interp(__tex_image_095, x, y); break;
case 96: r = kernel_tex_image_interp(__tex_image_096, x, y); break;
case 97: r = kernel_tex_image_interp(__tex_image_097, x, y); break;
- case 98: r = kernel_tex_image_interp(__tex_image_098, x, y); break;
#if defined(__CUDA_ARCH__) && (__CUDA_ARCH__ >= 300)
+ case 98: r = kernel_tex_image_interp(__tex_image_098, x, y); break;
case 99: r = kernel_tex_image_interp(__tex_image_099, x, y); break;
case 100: r = kernel_tex_image_interp(__tex_image_100, x, y); break;
case 101: r = kernel_tex_image_interp(__tex_image_101, x, y); break;
More information about the Bf-blender-cvs
mailing list