diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-05-11 05:38:39 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-05-11 05:38:39 +0400 |
| commit | c08c931fb6f57bdca7865d48ac09a0775590f3ce (patch) | |
| tree | 8d5bbe8b0e23288d6227545811b3822eebf01fba /intern/cycles/render/image.h | |
| parent | 8904eaf5047780eaf97eb7dc3acebb1b65f258bd (diff) | |
Cycles / CUDA: Increase maximum image textures on GPU.
Instead of 95, we can use 145 images now. This only affects Kepler and above (sm30, sm_35 and sm_50).
This can be increased further if needed, but let's first test if this does not come with a performance impact.
Originally developed during my GSoC 2013.
Diffstat (limited to 'intern/cycles/render/image.h')
| -rw-r--r-- | intern/cycles/render/image.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index a862ffce5c3..561550fe0d2 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -17,6 +17,7 @@ #ifndef __IMAGE_H__ #define __IMAGE_H__ +#include "device.h" #include "device_memory.h" #include "util_string.h" @@ -27,11 +28,16 @@ CCL_NAMESPACE_BEGIN +/* generic */ #define TEX_NUM_IMAGES 95 #define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES +/* extended gpu */ +#define TEX_EXTENDED_NUM_IMAGES_GPU 145 + +/* extended cpu */ #define TEX_EXTENDED_NUM_FLOAT_IMAGES 1024 -#define TEX_EXTENDED_NUM_IMAGES 1024 +#define TEX_EXTENDED_NUM_IMAGES_CPU 1024 #define TEX_EXTENDED_IMAGE_BYTE_START TEX_EXTENDED_NUM_FLOAT_IMAGES /* color to use when textures are not found */ @@ -59,7 +65,7 @@ public: void set_osl_texture_system(void *texture_system); void set_pack_images(bool pack_images_); - void set_extended_image_limits(void); + void set_extended_image_limits(const DeviceInfo& info); bool set_animation_frame_update(int frame); bool need_update; |