diff options
author | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
---|---|---|
committer | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
commit | 564bda241a973396da51d7c3ccd9efd97d51728a (patch) | |
tree | 4d9aa4cccd82e2e606b47774afa5e1015bf14768 /intern/cycles/kernel/geom/motion_curve.h | |
parent | 0fff238150d076576053c25b646f653d6e3b0edb (diff) | |
parent | 48d7ff68f0df209c77bbb081ab46fbc109fd825a (diff) |
Merge branch 'master' into feature-imformatfeature-imformat
Diffstat (limited to 'intern/cycles/kernel/geom/motion_curve.h')
-rw-r--r-- | intern/cycles/kernel/geom/motion_curve.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/intern/cycles/kernel/geom/motion_curve.h b/intern/cycles/kernel/geom/motion_curve.h index b5289b6dda1..448e4b95e0b 100644 --- a/intern/cycles/kernel/geom/motion_curve.h +++ b/intern/cycles/kernel/geom/motion_curve.h @@ -27,8 +27,8 @@ ccl_device_inline void motion_curve_keys_for_step_linear(KernelGlobals kg, { if (step == numsteps) { /* center step: regular key location */ - keys[0] = kernel_tex_fetch(__curve_keys, k0); - keys[1] = kernel_tex_fetch(__curve_keys, k1); + keys[0] = kernel_data_fetch(curve_keys, k0); + keys[1] = kernel_data_fetch(curve_keys, k1); } else { /* center step is not stored in this array */ @@ -37,8 +37,8 @@ ccl_device_inline void motion_curve_keys_for_step_linear(KernelGlobals kg, offset += step * numkeys; - keys[0] = kernel_tex_fetch(__attributes_float4, offset + k0); - keys[1] = kernel_tex_fetch(__attributes_float4, offset + k1); + keys[0] = kernel_data_fetch(attributes_float4, offset + k0); + keys[1] = kernel_data_fetch(attributes_float4, offset + k1); } } @@ -83,10 +83,10 @@ ccl_device_inline void motion_curve_keys_for_step(KernelGlobals kg, { if (step == numsteps) { /* center step: regular key location */ - keys[0] = kernel_tex_fetch(__curve_keys, k0); - keys[1] = kernel_tex_fetch(__curve_keys, k1); - keys[2] = kernel_tex_fetch(__curve_keys, k2); - keys[3] = kernel_tex_fetch(__curve_keys, k3); + keys[0] = kernel_data_fetch(curve_keys, k0); + keys[1] = kernel_data_fetch(curve_keys, k1); + keys[2] = kernel_data_fetch(curve_keys, k2); + keys[3] = kernel_data_fetch(curve_keys, k3); } else { /* center step is not stored in this array */ @@ -95,10 +95,10 @@ ccl_device_inline void motion_curve_keys_for_step(KernelGlobals kg, offset += step * numkeys; - keys[0] = kernel_tex_fetch(__attributes_float4, offset + k0); - keys[1] = kernel_tex_fetch(__attributes_float4, offset + k1); - keys[2] = kernel_tex_fetch(__attributes_float4, offset + k2); - keys[3] = kernel_tex_fetch(__attributes_float4, offset + k3); + keys[0] = kernel_data_fetch(attributes_float4, offset + k0); + keys[1] = kernel_data_fetch(attributes_float4, offset + k1); + keys[2] = kernel_data_fetch(attributes_float4, offset + k2); + keys[3] = kernel_data_fetch(attributes_float4, offset + k3); } } |