diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-08-11 23:30:03 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-08-11 23:30:03 +0300 |
| commit | 5ac7ef873b7b5895b3482387ba05168e694c6525 (patch) | |
| tree | a3447b515188600e1cccaa917aad8eaf47c6410d /intern/cycles/kernel/svm/svm_image.h | |
| parent | 3aed54dbd517f6c99b512ffa842bee75dea48fc7 (diff) | |
Cycles: Change code order for Image Data Types.
Now we have the 4 component ones first (float4, byte4, half4) followed by the 1 component ones (float, byte, half).
Makes code a bit more consistent and also reduces code a bit when enabling half support on GPU in next commit.
This also exposed a typo in half CPU images for 3D textures, which wasn't used yet, but good to have that one fixed anyway.
Diffstat (limited to 'intern/cycles/kernel/svm/svm_image.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm_image.h b/intern/cycles/kernel/svm/svm_image.h index b6b90dfff81..f359829374d 100644 --- a/intern/cycles/kernel/svm/svm_image.h +++ b/intern/cycles/kernel/svm/svm_image.h @@ -277,7 +277,7 @@ ccl_device float4 svm_image_texture(KernelGlobals *kg, int id, float x, float y, } # else CUtexObject tex = kernel_tex_fetch(__bindless_mapping, id); - if(id < 2048) /* TODO(dingto): Make this a variable */ + if(id < TEX_START_FLOAT_CUDA_KEPLER) r = kernel_tex_image_interp_float4(tex, x, y); else { float f = kernel_tex_image_interp_float(tex, x, y); |