Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/geom/motion_curve.h')
-rw-r--r--intern/cycles/kernel/geom/motion_curve.h24
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);
}
}