[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56377] trunk/blender: Tweak allocation vars for XYZ space for more accurate GPU transform

[Sergey Sharybin]

Revision: 56377
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56377
Author:   nazgul
Date:     2013-04-29 10:53:10 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Tweak allocation vars for XYZ space for more accurate GPU transform

Also extend 3DLUT edge size to 64 (1 meg of memory) to increase
transform accuracy as well.

Modified Paths:
--------------
    trunk/blender/intern/opencolorio/ocio_impl_glsl.cc
    trunk/blender/release/datafiles/colormanagement/config.ocio

Modified: trunk/blender/intern/opencolorio/ocio_impl_glsl.cc
===================================================================
--- trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-04-29 09:56:01 UTC (rev 56376)
+++ trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-04-29 10:53:10 UTC (rev 56377)
@@ -51,9 +51,8 @@
 
 #include "ocio_impl.h"
 
-static const int LUT3D_EDGE_SIZE = 32;
+static const int LUT3D_EDGE_SIZE = 64;
 
-
 /* **** OpenGL drawing routines using GLSL for color space transform ***** */
 
 typedef struct OCIO_GLSLDrawState {
@@ -97,7 +96,7 @@
 "        col[0] *= inv_alpha;\n"
 "        col[1] *= inv_alpha;\n"
 "        col[2] *= inv_alpha;\n"
-"}\n"
+"    }\n"
 "    gl_FragColor = OCIODisplay(col, tex2);\n"
 "\n"
 "}\n";

Modified: trunk/blender/release/datafiles/colormanagement/config.ocio
===================================================================
--- trunk/blender/release/datafiles/colormanagement/config.ocio	2013-04-29 09:56:01 UTC (rev 56376)
+++ trunk/blender/release/datafiles/colormanagement/config.ocio	2013-04-29 10:53:10 UTC (rev 56377)
@@ -171,11 +171,11 @@
     equalitygroup:
     bitdepth: 32f
     isdata: false
-    allocation: uniform
-    allocationvars: [0, 1]
+    allocation: lg2
+    allocationvars: [-8.5, 5]
     from_reference: !<GroupTransform>
       children:
-        - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: nearest}
+        - !<FileTransform> {src: rec709_to_aces.spimtx, interpolation: linear}
         - !<FileTransform> {src: aces_to_xyz.spimtx, interpolation: linear}
 
   - !<ColorSpace>