[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47430] trunk/blender/intern/cycles/kernel : Cycles / OSL:

[Thomas Dinges]

Revision: 47430
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47430
Author:   dingto
Date:     2012-06-04 19:00:13 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Cycles / OSL:
* __OSL__ is now defined for CPU when building with OSL.

* First batch of compile fixes, remove some unneeded std namespace declarations and added missing includes. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_types.h
    trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
    trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
    trunk/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2012-06-04 18:07:29 UTC (rev 47429)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2012-06-04 19:00:13 UTC (rev 47430)
@@ -39,7 +39,10 @@
 #ifdef __KERNEL_CPU__
 #define __KERNEL_SHADING__
 #define __KERNEL_ADV_SHADING__
+#ifdef WITH_OSL
+#define __OSL__
 #endif
+#endif
 
 #ifdef __KERNEL_CUDA__
 #define __KERNEL_SHADING__
@@ -107,7 +110,6 @@
 #endif
 
 //#define __MULTI_LIGHT__
-//#define __OSL__
 //#define __SOBOL_FULL_SCREEN__
 //#define __QBVH__
 

Modified: trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp	2012-06-04 18:07:29 UTC (rev 47429)
+++ trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp	2012-06-04 19:00:13 UTC (rev 47430)
@@ -36,6 +36,8 @@
 
 #include "osl_closures.h"
 
+#include "util_math.h"
+
 CCL_NAMESPACE_BEGIN
 
 using namespace OSL;
@@ -50,7 +52,7 @@
 
     void setup()
     {
-        m_sigma = std::max(m_sigma, 0.01f);
+        m_sigma = max(m_sigma, 0.01f);
         m_invsigma2 = 1.0f/(m_sigma * m_sigma);
     }
 
@@ -89,7 +91,7 @@
             float cosHO = fabsf(omega_out.dot(H));
 
             float cosNHdivHO = cosNH / cosHO;
-            cosNHdivHO = std::max(cosNHdivHO, 0.00001f);
+            cosNHdivHO = max(cosNHdivHO, 0.00001f);
 
             float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
             float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
@@ -99,7 +101,7 @@
             float cotangent2 =  (cosNH * cosNH) / sinNH2; 
 
             float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
-            float G = std::min(1.0f, std::min(fac1, fac2)); // TODO: derive G from D analytically
+            float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
 
             float out = 0.25f * (D * G) / cosNO;
 
@@ -133,7 +135,7 @@
             float cosHO = fabsf(omega_out.dot(H));
 
             float cosNHdivHO = cosNH / cosHO;
-            cosNHdivHO = std::max(cosNHdivHO, 0.00001f);
+            cosNHdivHO = max(cosNHdivHO, 0.00001f);
 
             float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
             float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
@@ -143,7 +145,7 @@
             float cotangent2 =  (cosNH * cosNH) / sinNH2; 
 
             float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
-            float G = std::min(1.0f, std::min(fac1, fac2)); // TODO: derive G from D analytically
+            float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
 
             float power = 0.25f * (D * G) / cosNO;
 

Modified: trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp	2012-06-04 18:07:29 UTC (rev 47429)
+++ trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp	2012-06-04 19:00:13 UTC (rev 47430)
@@ -36,6 +36,8 @@
 
 #include "osl_closures.h"
 
+#include "util_math.h"
+
 CCL_NAMESPACE_BEGIN
 
 using namespace OSL;
@@ -69,7 +71,7 @@
 
     Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
     {
-        float cos_pi = std::max(m_N.dot(omega_in),0.0f) * (float) M_1_PI;
+        float cos_pi = max(m_N.dot(omega_in),0.0f) * (float) M_1_PI;
         pdf = cos_pi;
         return Color3 (cos_pi, cos_pi, cos_pi);
     }
@@ -137,7 +139,7 @@
 
     Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
     {
-        float cos_pi = std::max(-m_N.dot(omega_in), 0.0f) * (float) M_1_PI;
+        float cos_pi = max(-m_N.dot(omega_in), 0.0f) * (float) M_1_PI;
         pdf = cos_pi;
         return Color3 (cos_pi, cos_pi, cos_pi);
     }

Modified: trunk/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp	2012-06-04 18:07:29 UTC (rev 47429)
+++ trunk/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp	2012-06-04 19:00:13 UTC (rev 47430)
@@ -19,6 +19,7 @@
 #include <OpenImageIO/fmath.h>
 #include <OSL/genclosure.h>
 #include "osl_closures.h"
+#include "util_math.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -118,7 +119,7 @@
 		float t = l.dot(v) - nl * nv;
 		
 		if(t > 0.0f) {
-			t /= max(nl, vl) + 1e-8f;
+			t /= max(nl, nv) + 1e-8f;
 		}
 		return nl * (m_a + m_b * t);
 	}