Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Simplify and de-duplicate assignements in the ImageManager constructor.

Browse Source
This commit is contained in:
Thomas Dinges
2016-05-27 23:12:13 +02:00
parent 2ee063868d
commit 2f457b7649
1 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
intern/cycles/render/image.cpp
View File

@@ -48,52 +48,33 @@ ImageManager::ImageManager(const DeviceInfo& info)
} }
/* Set image limits */ /* Set image limits */
#define SET_TEX_IMAGES_LIMITS(ARCH) \
/* CPU */ { \
if(device_type == DEVICE_CPU) { tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_ ## ARCH; \
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CPU; tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_ ## ARCH; \
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CPU; tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_ ## ARCH; \
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CPU; tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_ ## ARCH; \
tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CPU; tex_image_byte4_start = TEX_START_BYTE4_ ## ARCH; \
tex_image_byte4_start = TEX_START_BYTE4_CPU; tex_image_float_start = TEX_START_FLOAT_ ## ARCH; \
tex_image_float_start = TEX_START_FLOAT_CPU; tex_image_byte_start = TEX_START_BYTE_ ## ARCH; \
tex_image_byte_start = TEX_START_BYTE_CPU; }
if(device_type == DEVICE_CPU) {
SET_TEX_IMAGES_LIMITS(CPU);
} }
/* CUDA */
else if(device_type == DEVICE_CUDA) { else if(device_type == DEVICE_CUDA) {
if(info.has_bindless_textures) { if(info.has_bindless_textures) {
/* Kepler and above */ SET_TEX_IMAGES_LIMITS(CUDA_KEPLER);
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CUDA_KEPLER;
tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CUDA_KEPLER;
tex_image_byte4_start = TEX_START_BYTE4_CUDA_KEPLER;
tex_image_float_start = TEX_START_FLOAT_CUDA_KEPLER;
tex_image_byte_start = TEX_START_BYTE_CUDA_KEPLER;
} }
else { else {
/* Fermi */ SET_TEX_IMAGES_LIMITS(CUDA);
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_CUDA;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_CUDA;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_CUDA;
tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_CUDA;
tex_image_byte4_start = TEX_START_BYTE4_CUDA;
tex_image_float_start = TEX_START_FLOAT_CUDA;
tex_image_byte_start = TEX_START_BYTE_CUDA;
} }
} }
/* OpenCL */
else if(device_type == DEVICE_OPENCL) { else if(device_type == DEVICE_OPENCL) {
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = TEX_NUM_BYTE4_OPENCL; SET_TEX_IMAGES_LIMITS(OPENCL);
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = TEX_NUM_FLOAT4_OPENCL;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = TEX_NUM_FLOAT_OPENCL;
tex_num_images[IMAGE_DATA_TYPE_BYTE] = TEX_NUM_BYTE_OPENCL;
tex_image_byte4_start = TEX_START_BYTE4_OPENCL;
tex_image_float_start = TEX_START_FLOAT_OPENCL;
tex_image_byte_start = TEX_START_BYTE_OPENCL;
} }
/* Should never happen */
else { else {
/* Should never happen */
tex_num_images[IMAGE_DATA_TYPE_BYTE4] = 0; tex_num_images[IMAGE_DATA_TYPE_BYTE4] = 0;
tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = 0; tex_num_images[IMAGE_DATA_TYPE_FLOAT4] = 0;
tex_num_images[IMAGE_DATA_TYPE_FLOAT] = 0; tex_num_images[IMAGE_DATA_TYPE_FLOAT] = 0;
@@ -103,6 +84,8 @@ ImageManager::ImageManager(const DeviceInfo& info)
tex_image_byte_start = 0; tex_image_byte_start = 0;
assert(0); assert(0);
} }
#undef SET_TEX_IMAGES_LIMITS
} }
ImageManager::~ImageManager() ImageManager::~ImageManager()