diff options
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_color.h | 10 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/intern/cycles/kernel/kernel_color.h b/intern/cycles/kernel/kernel_color.h index d1c3dac824d..990e798543a 100644 --- a/intern/cycles/kernel/kernel_color.h +++ b/intern/cycles/kernel/kernel_color.h @@ -23,16 +23,16 @@ CCL_NAMESPACE_BEGIN ccl_device float3 xyz_to_rgb(KernelGlobals *kg, float3 xyz) { - return make_float3(dot(kernel_data.film.xyz_to_r, xyz), - dot(kernel_data.film.xyz_to_g, xyz), - dot(kernel_data.film.xyz_to_b, xyz)); + return make_float3(dot(float4_to_float3(kernel_data.film.xyz_to_r), xyz), + dot(float4_to_float3(kernel_data.film.xyz_to_g), xyz), + dot(float4_to_float3(kernel_data.film.xyz_to_b), xyz)); } ccl_device float linear_rgb_to_gray(KernelGlobals *kg, float3 c) { - return dot(c, kernel_data.film.rgb_to_y); + return dot(c, float4_to_float3(kernel_data.film.rgb_to_y)); } CCL_NAMESPACE_END -#endif /* __KERNEL_COLOR_H__ */
\ No newline at end of file +#endif /* __KERNEL_COLOR_H__ */ 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; |