Resolved conflicts

Author: Przemog1

examples_tests

@@ -5,26 +5,36 @@
 #ifndef _NBL_BUILTIN_GLSL_COLOR_SPACE_DECODE_CIE_XYZ_INCLUDED_
 #define _NBL_BUILTIN_GLSL_COLOR_SPACE_DECODE_CIE_XYZ_INCLUDED_
 
-const mat3 nbl_glsl_XYZtoscRGB = mat3(  vec3( 3.2404542,-0.9692660, 0.0556434),
-                                        vec3(-1.5371385, 1.8760108,-0.2040259),
-                                        vec3(-0.4985314, 0.0415560, 1.0572252));
+const mat3 nbl_glsl_XYZtoscRGB = mat3(
+    vec3( 3.240970f, -0.969244f,  0.055630f),
+    vec3(-1.537383f,  1.875968f, -0.203977f),
+    vec3(-0.498611f,  0.041555f,  1.056972f)
+);
 
 const mat3 nbl_glsl_XYZtosRGB = nbl_glsl_XYZtoscRGB;
 
 const mat3 nbl_glsl_XYZtoBT709 = nbl_glsl_XYZtoscRGB;
 
 
-const mat3 nbl_glsl_XYZtoDisplay_P3 = mat3( vec3( 2.4934969,-0.8294890, 0.0358458),
-                                            vec3(-0.9313836, 1.7626641,-0.0761724),
-                                            vec3(-0.4027108, 0.0236247, 0.9568845));
+const mat3 nbl_glsl_XYZtoDisplay_P3 = mat3(
+    vec3( 2.4934969119f,-0.8294889696f, 0.0358458302f),
+    vec3(-0.9313836179f, 1.7626640603f,-0.0761723893f),
+    vec3(-0.4027107845f, 0.0236246858f, 0.9568845240f)
+);
 
 
-const mat3 nbl_glsl_XYZtoDCI_P3 = mat3(vec3(1.0,0.0,0.0),vec3(0.0,1.0,0.0),vec3(0.0,0.0,1.0));
+const mat3 nbl_glsl_XYZtoDCI_P3 = mat3(
+    vec3(1.0f,0.0f,0.0f),
+    vec3(0.0f,1.0f,0.0f),
+    vec3(0.0f,0.0f,1.0f)
+);
 
 
-const mat3 nbl_glsl_XYZtoBT2020 = mat3( vec3( 1.7166512,-0.6666844, 0.0176399),
-                                        vec3(-0.3556708, 1.6164812,-0.0427706),
-                                        vec3(-0.2533663, 0.0157685, 0.9421031));
+const mat3 nbl_glsl_XYZtoBT2020 = mat3(
+    vec3( 1.716651f,-0.666684f, 0.017640f),
+    vec3(-0.355671f, 1.616481f,-0.042771f),
+    vec3(-0.253366f, 0.015769f, 0.942103f)
+);
 
 const mat3 nbl_glsl_XYZtoHDR10_ST2084 = nbl_glsl_XYZtoBT2020;
 
@@ -33,19 +43,25 @@ const mat3 nbl_glsl_XYZtoDOLBYIVISION = nbl_glsl_XYZtoBT2020;
 const mat3 nbl_glsl_XYZtoHDR10_HLG = nbl_glsl_XYZtoBT2020;
 
 
-const mat3 nbl_glsl_XYZtoAdobeRGB = mat3(   vec3( 2.04159,-0.96924, 0.01344),
-                                            vec3(-0.56501, 1.87597,-0.11836),
-                                            vec3(-0.34473, 0.04156, 1.01517));
+const mat3 nbl_glsl_XYZtoAdobeRGB = mat3(
+    vec3( 2.0415879038f,-0.9692436363f, 0.0134442806f),
+    vec3(-0.5650069743f, 1.8759675015f,-0.1183623922f),
+    vec3(-0.3447313508f, 0.0415550574f, 1.0151749944f)
+);
 
 
-const mat3 nbl_glsl_XYZtoACES2065_1 = mat3( vec3( 1.0498110175, 0.0000000000,-0.0000974845),
-                                            vec3(-0.4959030231, 1.3733130458, 0.0982400361),
-                                            vec3( 0.0000000000, 0.0000000000, 0.9912520182));
+const mat3 nbl_glsl_XYZtoACES2065_1 = mat3(
+    vec3( 1.0498110175f, -0.4959030231f, 0.0000000000f),
+    vec3( 0.0000000000f,  1.3733130458f, 0.0000000000f),
+    vec3(-0.0000974845f,  0.0982400361f, 0.9912520182f)
+);
 
 
-const mat3 nbl_glsl_XYZtoACEScc = mat3( vec3( 1.6410234,-0.6636629, 0.0117219),
-                                        vec3(-0.3248033, 1.6153316,-0.0082844),
-                                        vec3(-0.2364247, 0.0167563, 0.9883949));
+const mat3 nbl_glsl_XYZtoACEScc = mat3(
+    vec3( 1.6410233797f,-0.6636628587f, 0.0117218943f),
+    vec3(-0.3248032942f, 1.6153315917f,-0.0082844420f),
+    vec3(-0.2364246952f, 0.0167563477f, 0.9883948585f)
+);
 
 const mat3 nbl_glsl_XYZtoACEScct = nbl_glsl_XYZtoACEScc;
 

include/nbl/builtin/glsl/colorspace/decodeCIEXYZ.glsl

@@ -6,9 +6,9 @@
 #define _NBL_BUILTIN_GLSL_COLOR_SPACE_ENCODE_CIE_XYZ_INCLUDED_
 
 const mat3 nbl_glsl_scRGBtoXYZ = mat3(
-    vec3(0.4124564, 0.2126729, 0.0193339),
-    vec3(0.3575761, 0.7151522, 0.1191920),
-    vec3(0.1804375, 0.0721750, 0.9503041)
+    vec3(0.412391f, 0.212639f, 0.019331f),
+    vec3(0.357584f, 0.715169f, 0.119195f),
+    vec3(0.180481f, 0.072192f, 0.950532f)
 );
 
 const mat3 nbl_glsl_sRGBtoXYZ = nbl_glsl_scRGBtoXYZ;
@@ -17,23 +17,23 @@ const mat3 nbl_glsl_BT709toXYZ = nbl_glsl_scRGBtoXYZ;
 
 
 const mat3 nbl_glsl_Display_P3toXYZ = mat3(
-    vec3(0.4865709, 0.2289746, 0.0000000),
-    vec3(0.2656677, 0.6917385, 0.0451134),
-    vec3(0.1982173, 0.0792869, 1.0439444)
+    vec3(0.4865709486f, 0.2289745641f, 0.0000000000f),
+    vec3(0.2656676932f, 0.6917385218f, 0.0451133819f),
+    vec3(0.1982172852f, 0.0792869141f, 1.0439443689f)
 );
 
 
 const mat3 nbl_glsl_DCI_P3toXYZ = mat3(
-    vec3(1.0, 0.0, 0.0),
-    vec3(0.0, 1.0, 0.0),
-    vec3(0.0, 0.0, 1.0)
+    vec3(1.0f, 0.0f, 0.0f),
+    vec3(0.0f, 1.0f, 0.0f),
+    vec3(0.0f, 0.0f, 1.0f)
 );
 
 
 const mat3 nbl_glsl_BT2020toXYZ = mat3(
-    vec3(0.6369580, 0.2627002, 0.0000000),
-    vec3(0.1446169, 0.6779981, 0.0280727),
-    vec3(0.1688810, 0.0593017, 1.0609851)
+    vec3(0.636958f, 0.262700f, 0.000000f),
+    vec3(0.144617f, 0.677998f, 0.028073f),
+    vec3(0.168881f, 0.059302f, 1.060985f)
 );
 
 const mat3 nbl_glsl_HDR10_ST2084toXYZ = nbl_glsl_BT2020toXYZ;
@@ -44,23 +44,23 @@ const mat3 nbl_glsl_HDR10_HLGtoXYZ = nbl_glsl_BT2020toXYZ;
 
 
 const mat3 nbl_glsl_AdobeRGBtoXYZ = mat3(
-    vec3(0.57667, 0.29734, 0.02703),
-    vec3(0.18556, 0.62736, 0.07069),
-    vec3(0.18823, 0.07529, 0.99134)
+    vec3(0.5766690429f, 0.2973449753f, 0.0270313614f),
+    vec3(0.1855582379f, 0.6273635663f, 0.0706888525f),
+    vec3(0.1882286462f, 0.0752914585f, 0.9913375368f)
 );
 
 
 const mat3 nbl_glsl_ACES2065_1toXYZ = mat3(
-    vec3(0.9525523959, 0.3439664498, 0.0000000000),
-    vec3(0.0000000000, 0.7281660966, 0.0000000000),
-    vec3(0.0000936786, -0.0721325464, 1.0088251844)
+    vec3(0.9525523959f,  0.3439664498f, 0.0000000000f),
+    vec3(0.0000000000f,  0.7281660966f, 0.0000000000f),
+    vec3(0.0000936786f, -0.0721325464f, 1.0088251844f)
 );
 
 
 const mat3 nbl_glsl_ACEScctoXYZ = mat3(
-    vec3(0.6624542, 0.2722287, -0.0055746),
-    vec3(0.1340042, 0.6740818, 0.6740818),
-    vec3(0.1561877, 0.0536895, 1.0103391)
+    vec3(0.6624541811f, 0.2722287168f, -0.0055746495f),
+    vec3(0.1340042065f, 0.6740817658f,  0.0040607335f),
+    vec3(0.1561876870f, 0.0536895174f,  1.0103391003f)
 );
 
 const mat3 nbl_glsl_ACESccttoXYZ = nbl_glsl_ACEScctoXYZ;

include/nbl/builtin/glsl/colorspace/encodeCIEXYZ.glsl

@@ -0,0 +1,138 @@
+
+// Copyright (C) 2018-2022 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+
+#ifndef _NBL_BUILTIN_HLSL_COLOR_SPACE_EOTF_INCLUDED_
+#define _NBL_BUILTIN_HLSL_COLOR_SPACE_EOTF_INCLUDED_
+
+//#include <nbl/builtin/hlsl/common.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat/promote.hlsl>
+#include <nbl/builtin/hlsl/cpp_compat/type_traits.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace colorspace
+{
+namespace eotf
+{
+
+template<typename T>
+T identity(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    return nonlinear;
+}
+
+template<typename T>
+T impl_shared_2_4(NBL_CONST_REF_ARG(T) nonlinear, typename scalar_type<T>::type vertex)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    bool3 right = (nonlinear > promote<T, Val_t>(vertex));
+    return lerp(nonlinear / Val_t(12.92), pow((nonlinear + promote<T, Val_t>(0.055)) / Val_t(1.055), promote<T, Val_t>(2.4)), right);
+}
+
+// compatible with scRGB as well
+template<typename T>
+T sRGB(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    bool3 negatif = (nonlinear < promote<T, Val_t>(0.0));
+    T absVal = impl_shared_2_4<T>(abs(nonlinear), 0.04045);
+    return lerp(absVal, -absVal, negatif);
+}
+
+// also known as P3-D65
+template<typename T>
+T Display_P3(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    return impl_shared_2_4<T>(nonlinear, 0.039000312);
+}
+
+template<typename T>
+T DCI_P3_XYZ(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    return pow(nonlinear * Val_t(52.37), promote<T, Val_t>(2.6));
+}
+
+template<typename T>
+T SMPTE_170M(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    // ITU specs (and the outlier BT.2020) give different constants for these, but they introduce discontinuities in the mapping
+    // because HDR swapchains often employ the RGBA16_SFLOAT format, this would become apparent because its higher precision than 8,10,12 bits
+    Val_t alpha = 1.099296826809443; // 1.099 for all ITU but the BT.2020 12 bit encoding, 1.0993 otherwise
+    T delta = promote<T, Val_t>(0.081242858298635); // 0.0812 for all ITU but the BT.2020 12 bit encoding
+    return lerp(nonlinear / Val_t(4.5), pow((nonlinear + promote<T, Val_t>(alpha - 1.0)) / alpha, promote<T, Val_t>(1.0 / 0.45)), (nonlinear >= delta));
+}
+
+template<typename T>
+T SMPTE_ST2084(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    const T invm2 = promote<T, Val_t>(1.0 / 78.84375);
+    T _common = pow(invm2, invm2);
+
+    const T c2 = promote<T, Val_t>(18.8515625);
+    const Val_t c3 = 18.68875;
+    const T c1 = promote<T, Val_t>(c3 + 1.0) - c2;
+
+    const T invm1 = promote<T, Val_t>(1.0 / 0.1593017578125);
+    return pow(max(_common - c1, promote<T, Val_t>(0.0)) / (c2 - _common * c3), invm1);
+}
+
+// did I do this right by applying the function for every color?
+template<typename T>
+T HDR10_HLG(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    // done with log2 so constants are different
+    const Val_t a = 0.1239574303172;
+    const T b = promote<T, Val_t>(0.02372241);
+    const T c = promote<T, Val_t>(1.0042934693729);
+    bool3 right = (nonlinear > promote<T, Val_t>(0.5));
+    return lerp(nonlinear * nonlinear / Val_t(3.0), exp2((nonlinear - c) / a) + b, right);
+}
+
+template<typename T>
+T AdobeRGB(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    return pow(nonlinear, promote<T, Val_t>(2.19921875));
+}
+
+template<typename T>
+T Gamma_2_2(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    return pow(nonlinear, promote<T, Val_t>(2.2));
+}
+
+template<typename T>
+T ACEScc(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    bool3 right = (nonlinear >= promote<T, Val_t>(-0.301369863));
+    T _common = exp2(nonlinear * Val_t(17.52) - promote<T, Val_t>(9.72));
+    return max(lerp(_common * Val_t(2.0) - promote<T, Val_t>(0.000030517578125), _common, right), promote<T, Val_t>(65504.0));
+}
+
+template<typename T>
+T ACEScct(NBL_CONST_REF_ARG(T) nonlinear)
+{
+    typedef typename scalar_type<T>::type Val_t;
+    bool3 right = (nonlinear >= promote<T, Val_t>(0.155251141552511));
+    return max(lerp((nonlinear - promote<T, Val_t>(0.0729055341958355)) / Val_t(10.5402377416545), exp2(nonlinear * Val_t(17.52) - promote<T, Val_t>(9.72)), right), promote<T, Val_t>(65504.0));
+}
+
+}
+}
+}
+}
+
+#endif
+