Cleanup: Avoid duplicative defines for CPU textures, use the ones from util_texture.h

[blender-staging.git] / intern / cycles / kernel / kernel_globals.h

diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 52e718f8efd6191a7ae448e738e693a94b2c1a3d..b08d8924dc7069b76cd58506cf5697c210a96964 100644 (file)
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -31,12 +31,9 @@ struct OSLThreadData;
 struct OSLShadingSystem;
 #  endif
 
-#  define MAX_BYTE_IMAGES   1024
-#  define MAX_FLOAT_IMAGES  1024
-
 typedef struct KernelGlobals {
-       texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES];
-       texture_image_float4 texture_float_images[MAX_FLOAT_IMAGES];
+       texture_image_uchar4 texture_byte4_images[TEX_NUM_BYTE4_IMAGES_CPU];
+       texture_image_float4 texture_float4_images[TEX_NUM_FLOAT4_IMAGES_CPU];
 
 #  define KERNEL_TEX(type, ttype, name) ttype name;
 #  define KERNEL_IMAGE_TEX(type, ttype, name)