Commit: 195138c2525d79f2de8037c1c52a98e53a23df40 Author: Nicholas Bishop Date: Sun Feb 8 18:14:21 2015 +0100 Branches: cycles-ptex-49 https://developer.blender.org/rB195138c2525d79f2de8037c1c52a98e53a23df40
Potential Ptex+Cuda fix, adjust number of GPU texture slots =================================================================== 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 ca2da1f..8f1ed49 100644 --- a/intern/cycles/kernel/kernel_textures.h +++ b/intern/cycles/kernel/kernel_textures.h @@ -175,9 +175,9 @@ KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_094) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_095) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_096) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_097) -KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098) /* Kepler and above */ +KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_098) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_099) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_100) KERNEL_IMAGE_TEX(uchar4, texture_image_uchar4, __tex_image_101) @@ -229,7 +229,6 @@ 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 2abfd39..071ec63 100644 --- a/intern/cycles/render/image.h +++ b/intern/cycles/render/image.h @@ -29,11 +29,11 @@ CCL_NAMESPACE_BEGIN /* generic */ -#define TEX_NUM_IMAGES 94 +#define TEX_NUM_IMAGES 93 #define TEX_IMAGE_BYTE_START TEX_NUM_FLOAT_IMAGES /* extended gpu */ -#define TEX_EXTENDED_NUM_IMAGES_GPU 145 +#define TEX_EXTENDED_NUM_IMAGES_GPU 144 /* 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
