[Bf-blender-cvs] [4e12113bea] master: Cycles: Fix wrong render results with texture limit and half-float textures

[Sergey Sharybin]

Commit: 4e12113beac6a9a48cf65fc5604513c36c02c5f3
Author: Sergey Sharybin
Date:   Thu Feb 23 14:46:22 2017 +0100
Branches: master
https://developer.blender.org/rB4e12113beac6a9a48cf65fc5604513c36c02c5f3

Cycles: Fix wrong render results with texture limit and half-float textures

===================================================================

M       intern/cycles/util/util_image_impl.h

===================================================================

diff --git a/intern/cycles/util/util_image_impl.h 
b/intern/cycles/util/util_image_impl.h
index 73ecfda085..4daf1eaac2 100644
--- a/intern/cycles/util/util_image_impl.h
+++ b/intern/cycles/util/util_image_impl.h
@@ -19,6 +19,7 @@
 
 #include "util_algorithm.h"
 #include "util_debug.h"
+#include "util_half.h"
 #include "util_image.h"
 
 CCL_NAMESPACE_BEGIN
@@ -38,6 +39,52 @@ const T *util_image_read(const vector<T>& pixels,
        return &pixels[index];
 }
 
+/* Cast input pixel from unknown storage to float. */
+template<typename T>
+inline float cast_to_float(T value);
+
+template<>
+inline float cast_to_float(float value)
+{
+       return value;
+}
+template<>
+inline float cast_to_float(uchar value)
+{
+       return (float)value / 255.0f;
+}
+template<>
+inline float cast_to_float(half value)
+{
+       return half_to_float(value);
+}
+
+/* Cast float value to output pixel type. */
+template<typename T>
+inline T cast_from_float(float value);
+
+template<>
+inline float cast_from_float(float value)
+{
+       return value;
+}
+template<>
+inline uchar cast_from_float(float value)
+{
+       if(value < 0.0f) {
+               return 0;
+       }
+       else if(value > (1.0f - 0.5f / 255.0f)) {
+               return 255;
+       }
+       return (uchar)((255.0f * value) + 0.5f);
+}
+template<>
+inline half cast_from_float(float value)
+{
+       return float_to_half(value);
+}
+
 template<typename T>
 void util_image_downscale_sample(const vector<T>& pixels,
                                  const size_t width,
@@ -71,15 +118,22 @@ void util_image_downscale_sample(const vector<T>& pixels,
                                                                 components,
                                                                 nx, ny, nz);
                                for(size_t k = 0; k < components; ++k) {
-                                       accum[k] += pixel[k];
+                                       accum[k] += cast_to_float(pixel[k]);
                                }
                                ++count;
                        }
                }
        }
-       const float inv_count = 1.0f / (float)count;
-       for(size_t k = 0; k < components; ++k) {
-               result[k] = T(accum[k] * inv_count);
+       if(count != 0) {
+               const float inv_count = 1.0f / (float)count;
+               for(size_t k = 0; k < components; ++k) {
+                       result[k] = cast_from_float<T>(accum[k] * inv_count);
+               }
+       }
+       else {
+               for(size_t k = 0; k < components; ++k) {
+                       result[k] = T(0.0f);
+               }
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs