Cycles: Expose image image extension mapping to the image manager
[blender.git] / intern / cycles / kernel / kernel_compat_cpu.h
index 0bf1ed36d1ec0c263072e2f3f7f1845ef6cdec85..a780c356a187cd03b0d84fb3992ed4b3d9d08d99 100644 (file)
@@ -128,7 +128,7 @@ template<typename T> struct texture_image  {
                return x - (float)i;
        }
 
-       ccl_always_inline float4 interp(float x, float y, bool periodic = true)
+       ccl_always_inline float4 interp(float x, float y)
        {
                if(UNLIKELY(!data))
                        return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
@@ -233,14 +233,13 @@ template<typename T> struct texture_image  {
                }
        }
 
-       ccl_always_inline float4 interp_3d(float x, float y, float z, bool periodic = false)
+       ccl_always_inline float4 interp_3d(float x, float y, float z)
        {
-               return interp_3d_ex(x, y, z, interpolation, periodic);
+               return interp_3d_ex(x, y, z, interpolation);
        }
 
        ccl_always_inline float4 interp_3d_ex(float x, float y, float z,
-                                             int interpolation = INTERPOLATION_LINEAR,
-                                             bool periodic = false)
+                                             int interpolation = INTERPOLATION_LINEAR)
        {
                if(UNLIKELY(!data))
                        return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
@@ -393,6 +392,7 @@ template<typename T> struct texture_image  {
 
        T *data;
        int interpolation;
+       bool periodic;
        int width, height, depth;
 #undef SET_CUBIC_SPLINE_WEIGHTS
 };