From 3ee606621cf53a2a4897e534e7e04d3632f419f8 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Thu, 14 Jun 2018 17:48:19 +0200 Subject: Cycles: Query XYZ to/from Scene Linear conversion from OCIO instead of assuming sRGB I've limited it to just the RGB<->XYZ stuff for now, correct image handling is the next step. Reviewers: brecht, sergey Differential Revision: https://developer.blender.org/D3478 --- intern/cycles/kernel/kernel_color.h | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 intern/cycles/kernel/kernel_color.h (limited to 'intern/cycles/kernel/kernel_color.h') diff --git a/intern/cycles/kernel/kernel_color.h b/intern/cycles/kernel/kernel_color.h new file mode 100644 index 00000000000..d1c3dac824d --- /dev/null +++ b/intern/cycles/kernel/kernel_color.h @@ -0,0 +1,38 @@ +/* + * Copyright 2011-2018 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __KERNEL_COLOR_H__ +#define __KERNEL_COLOR_H__ + +#include "util/util_color.h" + +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)); +} + +ccl_device float linear_rgb_to_gray(KernelGlobals *kg, float3 c) +{ + return dot(c, kernel_data.film.rgb_to_y); +} + +CCL_NAMESPACE_END + +#endif /* __KERNEL_COLOR_H__ */ \ No newline at end of file -- cgit v1.2.3