diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-03-08 02:15:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 06:54:04 +0300 |
| commit | fa9175ff02acffd02679398e17732f3832d3fc28 (patch) | |
| tree | 2191527cffc89357f605aeeeded876ff5fcbfe6d /intern/cycles/kernel/geom/geom_object.h | |
| parent | f66ff4ee86a9ead9ef6f3776b64f4dda32eab521 (diff) | |
Code refactor: use KernelLight instead of float4 arrays.
Original patch by Stefan with modifications by Brecht.
Diffstat (limited to 'intern/cycles/kernel/geom/geom_object.h')
| -rw-r--r-- | intern/cycles/kernel/geom/geom_object.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h index 6bb4d134b99..9d833b77bdb 100644 --- a/intern/cycles/kernel/geom/geom_object.h +++ b/intern/cycles/kernel/geom/geom_object.h @@ -60,12 +60,17 @@ ccl_device_inline Transform object_fetch_transform(KernelGlobals *kg, int object ccl_device_inline Transform lamp_fetch_transform(KernelGlobals *kg, int lamp, bool inverse) { - int offset = lamp*LIGHT_SIZE + (inverse? 8 : 5); - Transform tfm; - tfm.x = kernel_tex_fetch(__light_data, offset + 0); - tfm.y = kernel_tex_fetch(__light_data, offset + 1); - tfm.z = kernel_tex_fetch(__light_data, offset + 2); + if(inverse) { + tfm.x = kernel_tex_fetch(__lights, lamp).itfm[0]; + tfm.y = kernel_tex_fetch(__lights, lamp).itfm[1]; + tfm.z = kernel_tex_fetch(__lights, lamp).itfm[2]; + } + else { + tfm.x = kernel_tex_fetch(__lights, lamp).tfm[0]; + tfm.y = kernel_tex_fetch(__lights, lamp).tfm[1]; + tfm.z = kernel_tex_fetch(__lights, lamp).tfm[2]; + } tfm.w = make_float4(0.0f, 0.0f, 0.0f, 1.0f); return tfm; @@ -240,8 +245,7 @@ ccl_device_inline float lamp_random_number(KernelGlobals *kg, int lamp) if(lamp == LAMP_NONE) return 0.0f; - float4 f = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 4); - return f.y; + return kernel_tex_fetch(__lights, lamp).random; } /* Per object random number for shader variation */ |