diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-06 14:42:50 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-06 15:37:35 +0300 |
| commit | 3807bcb3a845475ac938a331329d3fd92d90c3e4 (patch) | |
| tree | 98fc2b7357cd7ac02c9e16317f4bc8ec8a4f9100 /intern/cycles/kernel/kernel_globals.h | |
| parent | 36d8a70b00c2c0a1bc28ffad4cc2e283a77d7bab (diff) | |
Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.
Should be no functional changes, tested CPU and CUDA.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index 52e718f8efd..329123943d9 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -32,11 +32,11 @@ struct OSLShadingSystem; # endif # define MAX_BYTE_IMAGES 1024 -# define MAX_FLOAT_IMAGES 1024 +# define MAX_FLOAT4_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_float4 texture_float4_images[MAX_FLOAT4_IMAGES]; # define KERNEL_TEX(type, ttype, name) ttype name; # define KERNEL_IMAGE_TEX(type, ttype, name) |