diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 20:14:21 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-08 20:14:21 +0300 |
| commit | 195138c2525d79f2de8037c1c52a98e53a23df40 (patch) | |
| tree | 1fe1388885122de63de6304199226dc88caf1662 /intern/cycles | |
| parent | 3d286bd7a14d83a8c8417215b7e1ffdbb72dec0c (diff) | |
Potential Ptex+Cuda fix, adjust number of GPU texture slots
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/kernel_textures.h | 3 | ||||
| -rw-r--r-- | intern/cycles/render/image.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_textures.h b/intern/cycles/kernel/kernel_textures.h index ca2da1fca06..8f1ed49e088 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 2abfd3995bf..071ec63d554 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 |