[Bf-blender-cvs] [7a65f9b1716] master: Cleanup: Resolve todo in CUDA voxel image code.
Thomas Dinges
noreply at git.blender.org
Mon Mar 27 22:36:55 CEST 2017
Commit: 7a65f9b1716f9613f965d6e931939bc67d10f4db
Author: Thomas Dinges
Date: Mon Mar 27 22:36:26 2017 +0200
Branches: master
https://developer.blender.org/rB7a65f9b1716f9613f965d6e931939bc67d10f4db
Cleanup: Resolve todo in CUDA voxel image code.
===================================================================
M intern/cycles/kernel/svm/svm_voxel.h
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_voxel.h b/intern/cycles/kernel/svm/svm_voxel.h
index a8b3604a8a7..9e826c8c23f 100644
--- a/intern/cycles/kernel/svm/svm_voxel.h
+++ b/intern/cycles/kernel/svm/svm_voxel.h
@@ -46,7 +46,7 @@ ccl_device void svm_node_tex_voxel(KernelGlobals *kg,
# if defined(__KERNEL_CUDA__)
# if __CUDA_ARCH__ >= 300
CUtexObject tex = kernel_tex_fetch(__bindless_mapping, id);
- if(id < 2048) /* TODO(dingto): Make this a variable */
+ if(id < TEX_START_HALF4_CUDA_KEPLER)
r = kernel_tex_image_interp_3d_float4(tex, co.x, co.y, co.z);
else {
float f = kernel_tex_image_interp_3d_float(tex, co.x, co.y, co.z);
More information about the Bf-blender-cvs
mailing list