diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:05:24 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 12:05:24 +0400 |
| commit | 540c9d420853668ab6c3a3d402108d2f43abd2c5 (patch) | |
| tree | 4a4f924934e692ce7e98670d11973dd9d8a45245 /intern/cycles/kernel/kernel_types.h | |
| parent | 759ea4078782ace683a3e835166b7f324c8e3224 (diff) | |
Cycles: fix crash rendering textured objects in OpenCL
Issue was caused by changed order of texture slots -- float textures
have got lower slots indices than byte textures. OpenCL was still assuming
byte textures goes before float.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 930fffa3f40..98d998351a7 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -36,6 +36,8 @@ CCL_NAMESPACE_BEGIN #define PARTICLE_SIZE 5 #define TIME_INVALID FLT_MAX +#define TEX_NUM_FLOAT_IMAGES 5 + /* device capabilities */ #ifdef __KERNEL_CPU__ #define __KERNEL_SHADING__ |