[Bf-blender-cvs] [bf8c67e] temp-cycles-microdisplacement: Reduce maximum number of image textures on Fermi architecture

[Mai Lavelle]

Commit: bf8c67ed48d4fc16def79e8130b0d3bc86c679ab
Author: Mai Lavelle
Date:   Sat Jun 11 06:56:42 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBbf8c67ed48d4fc16def79e8130b0d3bc86c679ab

Reduce maximum number of image textures on Fermi architecture

The new __patches texture takes up a slot and goes past the limit on Fermi
cards which was causing the kernel to fail to build. To fix this there is now
one less image texture available.

===================================================================

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 3d9ab40..6db78ca 100644
--- a/intern/cycles/kernel/svm/svm_image.h
+++ b/intern/cycles/kernel/svm/svm_image.h
@@ -258,7 +258,6 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y,
 		case 89: r = kernel_tex_image_interp(__tex_image_byte4_089, x, y); break;
 		case 90: r = kernel_tex_image_interp(__tex_image_byte4_090, x, y); break;
 		case 91: r = kernel_tex_image_interp(__tex_image_byte4_091, x, y); break;
-		case 92: r = kernel_tex_image_interp(__tex_image_byte4_092, x, y); break;
 		default:
 			kernel_assert(0);
 			return make_float4(0.0f, 0.0f, 0.0f, 0.0f);