diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-06-21 20:09:54 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-06-21 20:09:54 +0300 |
| commit | dd6d0aefcc56288bfe154fe06df56163d6961372 (patch) | |
| tree | 7b74c26bcd48d0fbd844fd8b286c9a399813b203 /intern/cycles/kernel/geom/motion_triangle_shader.h | |
| parent | c27a395d8cd8b58b3155cfdc26ae35198fbcdb14 (diff) | |
| parent | 714001683888770f9d870ba73edd65f4c2757bda (diff) | |
Merge branch 'master' into asset-greasepencilasset-greasepencil
Diffstat (limited to 'intern/cycles/kernel/geom/motion_triangle_shader.h')
| -rw-r--r-- | intern/cycles/kernel/geom/motion_triangle_shader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/geom/motion_triangle_shader.h b/intern/cycles/kernel/geom/motion_triangle_shader.h index 2b2bb858816..236e737b785 100644 --- a/intern/cycles/kernel/geom/motion_triangle_shader.h +++ b/intern/cycles/kernel/geom/motion_triangle_shader.h @@ -31,7 +31,7 @@ ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals kg, bool is_local) { /* Get shader. */ - sd->shader = kernel_tex_fetch(__tri_shader, sd->prim); + sd->shader = kernel_data_fetch(tri_shader, sd->prim); /* Get motion info. */ /* TODO(sergey): This logic is really similar to motion_triangle_vertices(), * can we de-duplicate something here? @@ -47,7 +47,7 @@ ccl_device_noinline void motion_triangle_shader_setup(KernelGlobals kg, kernel_assert(offset != ATTR_STD_NOT_FOUND); /* Fetch vertex coordinates. */ float3 verts[3], next_verts[3]; - uint4 tri_vindex = kernel_tex_fetch(__tri_vindex, sd->prim); + uint4 tri_vindex = kernel_data_fetch(tri_vindex, sd->prim); motion_triangle_verts_for_step(kg, tri_vindex, offset, numverts, numsteps, step, verts); motion_triangle_verts_for_step(kg, tri_vindex, offset, numverts, numsteps, step + 1, next_verts); /* Interpolate between steps. */ |