diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-05-27 23:58:33 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-05-27 23:58:33 +0300 |
| commit | 2ee063868dca9abb7f76be101539fde70a830b72 (patch) | |
| tree | e2f299b0464b4f96779e429070e2b3f8ef168cf3 /intern/cycles/util | |
| parent | bd678f179b3e9d8e551c6f827ba97ed1defe1de2 (diff) | |
Cleanup: Shorten texture variables, tex and image was kinda redundant.
Also make prefix consistent, so it starts with either TEX_NUM or TEX_START, followed by texture type and architecture.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_texture.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index 6da47858133..c419c3aab61 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -19,43 +19,43 @@ CCL_NAMESPACE_BEGIN -/* Texture limits on various devices. */ +/* Texture limits on devices. */ /* CPU */ -#define TEX_NUM_BYTE4_IMAGES_CPU 1024 -#define TEX_NUM_FLOAT4_IMAGES_CPU 1024 -#define TEX_NUM_FLOAT_IMAGES_CPU 1024 -#define TEX_NUM_BYTE_IMAGES_CPU 1024 -#define TEX_IMAGE_BYTE4_START_CPU TEX_NUM_FLOAT4_IMAGES_CPU -#define TEX_IMAGE_FLOAT_START_CPU (TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU) -#define TEX_IMAGE_BYTE_START_CPU (TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU + TEX_NUM_BYTE_IMAGES_CPU) +#define TEX_NUM_FLOAT4_CPU 1024 +#define TEX_NUM_BYTE4_CPU 1024 +#define TEX_NUM_FLOAT_CPU 1024 +#define TEX_NUM_BYTE_CPU 1024 +#define TEX_START_BYTE4_CPU TEX_NUM_FLOAT4_CPU +#define TEX_START_FLOAT_CPU (TEX_NUM_FLOAT4_CPU + TEX_NUM_BYTE4_CPU) +#define TEX_START_BYTE_CPU (TEX_NUM_FLOAT4_CPU + TEX_NUM_BYTE4_CPU + TEX_NUM_BYTE_CPU) -/* CUDA (Fermi) */ -#define TEX_NUM_BYTE4_IMAGES_CUDA 88 -#define TEX_NUM_FLOAT4_IMAGES_CUDA 5 -#define TEX_NUM_FLOAT_IMAGES_CUDA 0 -#define TEX_NUM_BYTE_IMAGES_CUDA 0 -#define TEX_IMAGE_BYTE4_START_CUDA TEX_NUM_FLOAT4_IMAGES_CUDA -#define TEX_IMAGE_FLOAT_START_CUDA (TEX_NUM_FLOAT4_IMAGES_CUDA + TEX_NUM_BYTE4_IMAGES_CUDA) -#define TEX_IMAGE_BYTE_START_CUDA (TEX_NUM_FLOAT4_IMAGES_CUDA + TEX_NUM_BYTE4_IMAGES_CUDA + TEX_NUM_BYTE_IMAGES_CUDA) +/* CUDA (Geforce 4xx and 5xx) */ +#define TEX_NUM_FLOAT4_CUDA 5 +#define TEX_NUM_BYTE4_CUDA 88 +#define TEX_NUM_FLOAT_CUDA 0 +#define TEX_NUM_BYTE_CUDA 0 +#define TEX_START_BYTE4_CUDA TEX_NUM_FLOAT4_CUDA +#define TEX_START_FLOAT_CUDA (TEX_NUM_FLOAT4_CUDA + TEX_NUM_BYTE4_CUDA) +#define TEX_START_BYTE_CUDA (TEX_NUM_FLOAT4_CUDA + TEX_NUM_BYTE4_CUDA + TEX_NUM_BYTE_CUDA) -/* CUDA (KEPLER and above) */ -#define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER 1024 -#define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER 1024 -#define TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER 1024 -#define TEX_NUM_BYTE_IMAGES_CUDA_KEPLER 1024 -#define TEX_IMAGE_BYTE4_START_CUDA_KEPLER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER -#define TEX_IMAGE_FLOAT_START_CUDA_KEPLER (TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER) -#define TEX_IMAGE_BYTE_START_CUDA_KEPLER (TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE_IMAGES_CUDA_KEPLER) +/* CUDA (Kepler, Geforce 6xx and above) */ +#define TEX_NUM_FLOAT4_CUDA_KEPLER 1024 +#define TEX_NUM_BYTE4_CUDA_KEPLER 1024 +#define TEX_NUM_FLOAT_CUDA_KEPLER 1024 +#define TEX_NUM_BYTE_CUDA_KEPLER 1024 +#define TEX_START_BYTE4_CUDA_KEPLER TEX_NUM_FLOAT4_CUDA_KEPLER +#define TEX_START_FLOAT_CUDA_KEPLER (TEX_NUM_FLOAT4_CUDA_KEPLER + TEX_NUM_BYTE4_CUDA_KEPLER) +#define TEX_START_BYTE_CUDA_KEPLER (TEX_NUM_FLOAT4_CUDA_KEPLER + TEX_NUM_BYTE4_CUDA_KEPLER + TEX_NUM_BYTE_CUDA_KEPLER) /* OpenCL */ -#define TEX_NUM_BYTE4_IMAGES_OPENCL 1024 -#define TEX_NUM_FLOAT4_IMAGES_OPENCL 1024 -#define TEX_NUM_FLOAT_IMAGES_OPENCL 0 -#define TEX_NUM_BYTE_IMAGES_OPENCL 0 -#define TEX_IMAGE_BYTE4_START_OPENCL TEX_NUM_FLOAT4_IMAGES_OPENCL -#define TEX_IMAGE_FLOAT_START_OPENCL (TEX_NUM_FLOAT4_IMAGES_OPENCL + TEX_NUM_BYTE4_IMAGES_OPENCL) -#define TEX_IMAGE_BYTE_START_OPENCL (TEX_NUM_FLOAT4_IMAGES_OPENCL + TEX_NUM_BYTE4_IMAGES_OPENCL + TEX_NUM_BYTE_IMAGES_OPENCL) +#define TEX_NUM_FLOAT4_OPENCL 1024 +#define TEX_NUM_BYTE4_OPENCL 1024 +#define TEX_NUM_FLOAT_OPENCL 0 +#define TEX_NUM_BYTE_OPENCL 0 +#define TEX_START_BYTE4_OPENCL TEX_NUM_FLOAT4_OPENCL +#define TEX_START_FLOAT_OPENCL (TEX_NUM_FLOAT4_OPENCL + TEX_NUM_BYTE4_OPENCL) +#define TEX_START_BYTE_OPENCL (TEX_NUM_FLOAT4_OPENCL + TEX_NUM_BYTE4_OPENCL + TEX_NUM_BYTE_OPENCL) /* Color to use when textures are not found. */ |