From 3807bcb3a845475ac938a331329d3fd92d90c3e4 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Fri, 6 May 2016 13:42:50 +0200 Subject: Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots. Should be no functional changes, tested CPU and CUDA. --- intern/cycles/kernel/geom/geom_volume.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'intern/cycles/kernel/geom/geom_volume.h') diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/geom_volume.h index 14b6738b23e..7bd3933a1f8 100644 --- a/intern/cycles/kernel/geom/geom_volume.h +++ b/intern/cycles/kernel/geom/geom_volume.h @@ -34,11 +34,11 @@ ccl_device float4 volume_image_texture_3d(int id, float x, float y, float z) { float4 r; switch(id) { - case 0: r = kernel_tex_image_interp_3d(__tex_image_float3d_000, x, y, z); break; - case 1: r = kernel_tex_image_interp_3d(__tex_image_float3d_001, x, y, z); break; - case 2: r = kernel_tex_image_interp_3d(__tex_image_float3d_002, x, y, z); break; - case 3: r = kernel_tex_image_interp_3d(__tex_image_float3d_003, x, y, z); break; - case 4: r = kernel_tex_image_interp_3d(__tex_image_float3d_004, x, y, z); break; + case 0: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_000, x, y, z); break; + case 1: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_001, x, y, z); break; + case 2: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_002, x, y, z); break; + case 3: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_003, x, y, z); break; + case 4: r = kernel_tex_image_interp_3d(__tex_image_float4_3d_004, x, y, z); break; } return r; } -- cgit v1.2.3