diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-09 10:16:41 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-09 10:16:41 +0300 |
| commit | d6555d936cb15c3d64836ca1446bfc7b065b4aa0 (patch) | |
| tree | 12f61bb782637620d9a2cad159c5cf9a4ded50a3 /intern/cycles/kernel/kernels/cpu/kernel.cpp | |
| parent | e0e7d94f79a512dd33d2f8cdf1685112a8327674 (diff) | |
Cleanup: Avoid duplicative defines for CPU textures, use the ones from util_texture.h
Also includes some further byte -> byte4 renaming, missed that in last commit.
Diffstat (limited to 'intern/cycles/kernel/kernels/cpu/kernel.cpp')
| -rw-r--r-- | intern/cycles/kernel/kernels/cpu/kernel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernels/cpu/kernel.cpp b/intern/cycles/kernel/kernels/cpu/kernel.cpp index c0a333ab18c..e7d0d8a0408 100644 --- a/intern/cycles/kernel/kernels/cpu/kernel.cpp +++ b/intern/cycles/kernel/kernels/cpu/kernel.cpp @@ -95,7 +95,7 @@ void kernel_tex_copy(KernelGlobals *kg, int id = atoi(name + strlen("__tex_image_float4_")); int array_index = id; - if(array_index >= 0 && array_index < MAX_FLOAT4_IMAGES) { + if(array_index >= 0 && array_index < TEX_NUM_FLOAT4_IMAGES_CPU) { tex = &kg->texture_float4_images[array_index]; } @@ -109,10 +109,10 @@ void kernel_tex_copy(KernelGlobals *kg, else if(strstr(name, "__tex_image_byte4")) { texture_image_uchar4 *tex = NULL; int id = atoi(name + strlen("__tex_image_byte4_")); - int array_index = id - MAX_FLOAT4_IMAGES; + int array_index = id - TEX_NUM_FLOAT4_IMAGES_CPU; - if(array_index >= 0 && array_index < MAX_BYTE_IMAGES) { - tex = &kg->texture_byte_images[array_index]; + if(array_index >= 0 && array_index < TEX_NUM_BYTE4_IMAGES_CPU) { + tex = &kg->texture_byte4_images[array_index]; } if(tex) { |