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/render/image.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/render/image.h')
-rw-r--r-- | intern/cycles/render/image.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 8fb229282dc..485bfc5cbf5 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -25,9 +25,10 @@ #include "util_thread.h" #include "util_vector.h" +#include "kernel_types.h" /* for TEX_NUM_FLOAT_IMAGES */ + CCL_NAMESPACE_BEGIN -#define TEX_NUM_FLOAT_IMAGES 5 #define TEX_NUM_IMAGES 95 #define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES |