diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 20:23:36 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 20:23:36 +0300 |
| commit | 4009251a77db379c428ff4370a4fbc29f5c44081 (patch) | |
| tree | f6ae816154285ec73344d95d4d346e77bef712b6 /intern/cycles | |
| parent | 195138c2525d79f2de8037c1c52a98e53a23df40 (diff) | |
Bring back __tex_image_150 on DingTo's advice
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 1 | ||||
| -rw-r--r-- | intern/cycles/render/image.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index 8f1ed49e088..29cbee7731e 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -229,6 +229,7 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_146) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_147) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_148) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_149) +KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_150) /* packed image (opencl) */ KERNEL_TEX(uchar4, texture_uchar4, __tex_image_packed) diff --git a/intern/cycles/render/image.h b/intern/cycles/render/image.h index 071ec63d554..44628621191 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -33,7 +33,7 @@ CCL_NAMESPACE_BEGIN #define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES /* extended gpu */ -#define TEX_EXTENDED_NUM_IMAGES_GPU 144 +#define TEX_EXTENDED_NUM_IMAGES_GPU 145 /* extended cpu */ #define TEX_EXTENDED_NUM_FLOAT_IMAGES 1024 |