Commit: 4009251a77db379c428ff4370a4fbc29f5c44081 Author: Nicholas Bishop Date: Sun Feb 8 18:23:36 2015 +0100 Branches: cycles-ptex-49 https://developer.blender.org/rB4009251a77db379c428ff4370a4fbc29f5c44081
Bring back __tex_image_150 on DingTo's advice =================================================================== M intern/cycles/kernel/kernel_textures.h M intern/cycles/render/image.h =================================================================== diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index 8f1ed49..29cbee7 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 071ec63..4462862 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 _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
