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.
This commit is contained in:
Thomas Dinges
2013-12-14 15:06:18 +01:00
committed by Brecht Van Lommel
parent 5fdfa6d475
commit 1bebdc9ad0
3 changed files with 5 additions and 5 deletions

View File

@@ -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];

View File

@@ -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;

View File

@@ -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 */