diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-09 03:22:01 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-09 03:22:01 +0300 |
| commit | 9a1e11260c667dce5df123c2b451d119d8c05a7b (patch) | |
| tree | ebe69d91a9c2853fe82e88697fc6108a69f302b0 /intern/cycles/util | |
| parent | 5fe1bea2daecd7670a6a7688a24432e9dce96802 (diff) | |
Cleanup: More byte -> byte4 renaming for consistency.
Diffstat (limited to 'intern/cycles/util')
| -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 2894a1a0b41..837858d0687 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -22,24 +22,24 @@ CCL_NAMESPACE_BEGIN /* Texture limits on various devices. */ /* CPU */ -#define TEX_NUM_BYTE_IMAGES_CPU 1024 +#define TEX_NUM_BYTE4_IMAGES_CPU 1024 #define TEX_NUM_FLOAT4_IMAGES_CPU 1024 -#define TEX_IMAGE_BYTE_START_CPU TEX_NUM_FLOAT4_IMAGES_CPU +#define TEX_IMAGE_BYTE4_START_CPU TEX_NUM_FLOAT4_IMAGES_CPU /* CUDA (Fermi) */ -#define TEX_NUM_BYTE_IMAGES_CUDA 88 +#define TEX_NUM_BYTE4_IMAGES_CUDA 88 #define TEX_NUM_FLOAT4_IMAGES_CUDA 5 -#define TEX_IMAGE_BYTE_START_CUDA TEX_NUM_FLOAT4_IMAGES_CUDA +#define TEX_IMAGE_BYTE4_START_CUDA TEX_NUM_FLOAT4_IMAGES_CUDA /* CUDA (KEPLER and above) */ -#define TEX_NUM_BYTE_IMAGES_CUDA_KEPLER 145 +#define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER 145 #define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER 5 -#define TEX_IMAGE_BYTE_START_CUDA_KELPER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER +#define TEX_IMAGE_BYTE4_START_CUDA_KELPER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER /* OpenCL */ -#define TEX_NUM_BYTE_IMAGES_OPENCL 1024 +#define TEX_NUM_BYTE4_IMAGES_OPENCL 1024 #define TEX_NUM_FLOAT4_IMAGES_OPENCL 0 -#define TEX_IMAGE_BYTE_START_OPENCL TEX_NUM_FLOAT4_IMAGES_OPENCL +#define TEX_IMAGE_BYTE4_START_OPENCL TEX_NUM_FLOAT4_IMAGES_OPENCL /* Color to use when textures are not found. */ |