[Bf-blender-cvs] [1bebdc9] master: Fix T37264: cycles CPU render had limited number of float images, bumped to 1024.

[Thomas Dinges]

Commit: 1bebdc9ad0b6174a9aee243ad37fcc20db23791c
Author: Thomas Dinges
Date:   Sat Dec 14 15:06:18 2013 +0100
http://developer.blender.org/rB1bebdc9ad0b6174a9aee243ad37fcc20db23791c

Fix T37264: cycles CPU render had limited number of float images, bumped to 1024.

GPU is still limited to 5, but there's no good reason for the CPU to be limited.

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

M	intern/cycles/kernel/kernel_globals.h
M	intern/cycles/render/image.cpp
M	intern/cycles/render/image.h

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

diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index e60bd6c..6bd2ec0 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -31,8 +31,8 @@ struct OSLThreadData;
 struct OSLShadingSystem;
 #endif
 
-#define MAX_BYTE_IMAGES   512
-#define MAX_FLOAT_IMAGES  5
+#define MAX_BYTE_IMAGES   1024
+#define MAX_FLOAT_IMAGES  1024
 
 typedef struct KernelGlobals {
 	texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index dcb2845..91aae6f 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -170,7 +170,7 @@ int ImageManager::add_image(const string& filename, void *builtin_data, bool ani
 
 		if(slot == float_images.size()) {
 			/* max images limit reached */
-			if(float_images.size() == TEX_NUM_FLOAT_IMAGES) {
+			if(float_images.size() == tex_num_float_images) {
 				printf("ImageManager::add_image: float image limit reached %d, skipping '%s'\n",
 				       tex_num_float_images, filename.c_str());
 				return -1;
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h
index f7be545..187c5fd 100644
--- a/intern/cycles/render/image.h
+++ b/intern/cycles/render/image.h
@@ -30,8 +30,8 @@ CCL_NAMESPACE_BEGIN
 #define TEX_NUM_IMAGES			95
 #define TEX_IMAGE_BYTE_START	TEX_NUM_FLOAT_IMAGES
 
-#define TEX_EXTENDED_NUM_FLOAT_IMAGES	5
-#define TEX_EXTENDED_NUM_IMAGES			512
+#define TEX_EXTENDED_NUM_FLOAT_IMAGES	1024
+#define TEX_EXTENDED_NUM_IMAGES			1024
 #define TEX_EXTENDED_IMAGE_BYTE_START	TEX_EXTENDED_NUM_FLOAT_IMAGES
 
 /* color to use when textures are not found */