diff options
Diffstat (limited to 'intern/cycles/util/util_texture.h')
-rw-r--r-- | intern/cycles/util/util_texture.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index 2b6b8e743fb..2894a1a0b41 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -23,23 +23,23 @@ CCL_NAMESPACE_BEGIN /* CPU */ #define TEX_NUM_BYTE_IMAGES_CPU 1024 -#define TEX_NUM_FLOAT_IMAGES_CPU 1024 -#define TEX_IMAGE_BYTE_START_CPU TEX_NUM_FLOAT_IMAGES_CPU +#define TEX_NUM_FLOAT4_IMAGES_CPU 1024 +#define TEX_IMAGE_BYTE_START_CPU TEX_NUM_FLOAT4_IMAGES_CPU /* CUDA (Fermi) */ #define TEX_NUM_BYTE_IMAGES_CUDA 88 -#define TEX_NUM_FLOAT_IMAGES_CUDA 5 -#define TEX_IMAGE_BYTE_START_CUDA TEX_NUM_FLOAT_IMAGES_CUDA +#define TEX_NUM_FLOAT4_IMAGES_CUDA 5 +#define TEX_IMAGE_BYTE_START_CUDA TEX_NUM_FLOAT4_IMAGES_CUDA /* CUDA (KEPLER and above) */ #define TEX_NUM_BYTE_IMAGES_CUDA_KEPLER 145 -#define TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER 5 -#define TEX_IMAGE_BYTE_START_CUDA_KELPER TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER +#define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER 5 +#define TEX_IMAGE_BYTE_START_CUDA_KELPER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER /* OpenCL */ #define TEX_NUM_BYTE_IMAGES_OPENCL 1024 -#define TEX_NUM_FLOAT_IMAGES_OPENCL 0 -#define TEX_IMAGE_BYTE_START_OPENCL TEX_NUM_FLOAT_IMAGES_OPENCL +#define TEX_NUM_FLOAT4_IMAGES_OPENCL 0 +#define TEX_IMAGE_BYTE_START_OPENCL TEX_NUM_FLOAT4_IMAGES_OPENCL /* Color to use when textures are not found. */ |