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/kernel_globals.h | |
| 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/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index 329123943d9..b08d8924dc7 100644 --- 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_FLOAT4_IMAGES 1024 - typedef struct KernelGlobals { - texture_image_uchar4 texture_byte_images[MAX_BYTE_IMAGES]; - texture_image_float4 texture_float4_images[MAX_FLOAT4_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) |