[Bf-blender-cvs] [bbbc079] master: Cycles: Correct maximum number of textures on pre-Kepler CUDA cards

[Lukas Stockner]

Commit: bbbc079a6c03b0df863ab0aae8b7838d4eb41cbb
Author: Lukas Stockner
Date:   Wed Aug 10 17:17:46 2016 +0200
Branches: master
https://developer.blender.org/rBbbbc079a6c03b0df863ab0aae8b7838d4eb41cbb

Cycles: Correct maximum number of textures on pre-Kepler CUDA cards

Commit c96ae81160ad added three data textures and therefore removed three image texture slots, but the value in util_textures.h wasn't updated.

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

M	intern/cycles/util/util_texture.h

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

diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h
index 2ef4728..0cecfe9 100644
--- a/intern/cycles/util/util_texture.h
+++ b/intern/cycles/util/util_texture.h
@@ -37,7 +37,7 @@ CCL_NAMESPACE_BEGIN
 
 /* CUDA (Geforce 4xx and 5xx) */
 #define TEX_NUM_FLOAT4_CUDA		5
-#define TEX_NUM_BYTE4_CUDA		88
+#define TEX_NUM_BYTE4_CUDA		85
 #define TEX_NUM_FLOAT_CUDA		0
 #define TEX_NUM_BYTE_CUDA		0
 #define TEX_NUM_HALF4_CUDA		0