Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Also includes some further byte -> byte4 renaming, missed that in last commit.
This commit is contained in:
Thomas Dinges
2016-05-09 09:16:41 +02:00
parent e0e7d94f79
commit d6555d936c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/kernel_globals.h
View File

@@ -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)