simplify OCIO shapers

ampas · Dec 19, 2014 · 6853fc3 · 6853fc3
1 parent 2180530
commit 6853fc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/transforms/ctl/utilities/ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl b/transforms/ctl/utilities/ACESlib.OCIO_shaper_lin_to_log2_param.a1.0.0.ctl
@@ -40,16 +40,8 @@ void main
   output varying float aOut
 )
 {
-  float lin[3] = {rIn, gIn, bIn};
-
-  float log32f[3];
-  log32f[0] = lin_to_log2_32f( lin[0], middleGrey, minExposure, maxExposure);
-  log32f[1] = lin_to_log2_32f( lin[1], middleGrey, minExposure, maxExposure);
-  log32f[2] = lin_to_log2_32f( lin[2], middleGrey, minExposure, maxExposure);
-
-  const float scalar = 1.0;
-  rOut = log32f[0] / scalar;
-  gOut = log32f[1] / scalar;
-  bOut = log32f[2] / scalar;
+  rOut = lin_to_log2_32f( rIn, middleGrey, minExposure, maxExposure);
+  gOut = lin_to_log2_32f( gIn, middleGrey, minExposure, maxExposure);
+  bOut = lin_to_log2_32f( bIn, middleGrey, minExposure, maxExposure);
   aOut = aIn;  
 }
diff --git a/transforms/ctl/utilities/ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl b/transforms/ctl/utilities/ACESlib.OCIO_shaper_log2_to_lin_param.a1.0.0.ctl
@@ -39,9 +39,8 @@ void main
 )
 
 {
-  const float scalar = 1.0;
-  rOut = log2_to_lin_32f( rIn / scalar, middleGrey, minExposure, maxExposure);
-  gOut = log2_to_lin_32f( gIn / scalar, middleGrey, minExposure, maxExposure);
-  bOut = log2_to_lin_32f( bIn / scalar, middleGrey, minExposure, maxExposure);
+  rOut = log2_to_lin_32f( rIn, middleGrey, minExposure, maxExposure);
+  gOut = log2_to_lin_32f( gIn, middleGrey, minExposure, maxExposure);
+  bOut = log2_to_lin_32f( bIn, middleGrey, minExposure, maxExposure);
   aOut = aIn;  
 }