diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 16:58:48 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-15 17:28:09 +0300 |
commit | 2e25a48b05004112344b04cd56760709eebfc1a4 (patch) | |
tree | 53d9bd7e2a411d05ef40c82bce58b9021afb0311 /intern/cycles/kernel/kernel_types.h | |
parent | b84fad2ba3920f3e337dc9084a30f1ea38f39fc2 (diff) |
Fix more Cycles CUDA errors after recent changes.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index e8cbd330184..8df7c369799 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1274,10 +1274,12 @@ typedef struct KernelFilm { int pad1, pad2, pad3; - float3 xyz_to_r; - float3 xyz_to_g; - float3 xyz_to_b; - float3 rgb_to_y; + /* XYZ to rendering color space transform. float4 instead of float3 to + * ensure consistent padding/alignment across devices. */ + float4 xyz_to_r; + float4 xyz_to_g; + float4 xyz_to_b; + float4 rgb_to_y; #ifdef __KERNEL_DEBUG__ int pass_bvh_traversed_nodes; |