diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-13 20:13:35 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-15 16:42:44 +0300 |
| commit | 2ba7c3aa650c3c795d903a24998204f67c75b017 (patch) | |
| tree | ef80c7cadbe59d1062dd75818baad4d8ad594bcb /intern/cycles/kernel/kernel_bake.h | |
| parent | 70376154a0b09dc05fcc5bd79c33fdf7c6acbd9a (diff) | |
Cleanup: refactor to make number of channels for shader evaluation variable
Diffstat (limited to 'intern/cycles/kernel/kernel_bake.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_bake.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_bake.h b/intern/cycles/kernel/kernel_bake.h index cfff727d007..6cbb8dcc291 100644 --- a/intern/cycles/kernel/kernel_bake.h +++ b/intern/cycles/kernel/kernel_bake.h @@ -26,7 +26,7 @@ CCL_NAMESPACE_BEGIN ccl_device void kernel_displace_evaluate(ccl_global const KernelGlobals *kg, ccl_global const KernelShaderEvalInput *input, - ccl_global float4 *output, + ccl_global float *output, const int offset) { /* Setup shader data. */ @@ -53,12 +53,14 @@ ccl_device void kernel_displace_evaluate(ccl_global const KernelGlobals *kg, D = ensure_finite3(D); /* Write output. */ - output[offset] += make_float4(D.x, D.y, D.z, 0.0f); + output[offset * 3 + 0] += D.x; + output[offset * 3 + 1] += D.y; + output[offset * 3 + 2] += D.z; } ccl_device void kernel_background_evaluate(ccl_global const KernelGlobals *kg, ccl_global const KernelShaderEvalInput *input, - ccl_global float4 *output, + ccl_global float *output, const int offset) { /* Setup ray */ @@ -88,7 +90,9 @@ ccl_device void kernel_background_evaluate(ccl_global const KernelGlobals *kg, color = ensure_finite3(color); /* Write output. */ - output[offset] += make_float4(color.x, color.y, color.z, 0.0f); + output[offset * 3 + 0] += color.x; + output[offset * 3 + 1] += color.y; + output[offset * 3 + 2] += color.z; } CCL_NAMESPACE_END |