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

Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots.

Browse Source 
Should be no functional changes, tested CPU and CUDA.
This commit is contained in:
Thomas Dinges
2016-05-06 13:42:50 +02:00
parent 36d8a70b00
commit 3807bcb3a8
11 changed files with 365 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
intern/cycles/util/util_texture.h
View File

@@ -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. */