diff options
author | Thomas Dinges <blender@dingto.org> | 2016-05-12 03:11:19 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2016-05-12 03:11:36 +0300 |
commit | 8de3303a03f39afbef00a1ee5972116eb01379fe (patch) | |
tree | 4b47f0ff675d5f7b61a3370da661d95b73834700 /intern | |
parent | c5ddbf181e7de0c8dbef756059367abcec061956 (diff) |
Cleanup: Fix typo.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/image.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/util/util_texture.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 40c48088c5a..0985cca5bb6 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -59,8 +59,8 @@ ImageManager::ImageManager(const DeviceInfo& info) tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER; tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER; tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER; - tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA_KELPER; - tex_image_float_start = TEX_IMAGE_FLOAT_START_CUDA_KELPER; + tex_image_byte4_start = TEX_IMAGE_BYTE4_START_CUDA_KEPLER; + tex_image_float_start = TEX_IMAGE_FLOAT_START_CUDA_KEPLER; } /* OpenCL */ else if(info.pack_images) { diff --git a/intern/cycles/util/util_texture.h b/intern/cycles/util/util_texture.h index 725036907da..e5a36ddd0cb 100644 --- a/intern/cycles/util/util_texture.h +++ b/intern/cycles/util/util_texture.h @@ -26,7 +26,7 @@ CCL_NAMESPACE_BEGIN #define TEX_NUM_FLOAT4_IMAGES_CPU 1024 #define TEX_NUM_FLOAT_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_FLOAT_START_CPU TEX_NUM_FLOAT4_IMAGES_CPU + TEX_NUM_BYTE4_IMAGES_CPU /* CUDA (Fermi) */ #define TEX_NUM_BYTE4_IMAGES_CUDA 88 @@ -39,8 +39,8 @@ CCL_NAMESPACE_BEGIN #define TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER 145 #define TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER 5 #define TEX_NUM_FLOAT_IMAGES_CUDA_KEPLER 0 -#define TEX_IMAGE_BYTE4_START_CUDA_KELPER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER -#define TEX_IMAGE_FLOAT_START_CUDA_KELPER TEX_NUM_FLOAT4_IMAGES_CUDA_KEPLER + TEX_NUM_BYTE4_IMAGES_CUDA_KEPLER +#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 /* OpenCL */ #define TEX_NUM_BYTE4_IMAGES_OPENCL 1024 |