Code cleanup / Cycles:

* Re-use already defined Westin closure class. 

3 files changed, 8 insertions, 186 deletions

diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index 76b80ba9d86..6403606c2df 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -96,14 +96,14 @@ __device int bsdf_sample(KernelGlobals *kg, const ShaderData *sd, const ShaderCl
 			label = bsdf_ashikhmin_velvet_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
 				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
 			break;
-		/*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+		case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
 			label = bsdf_westin_backscatter_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
 				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
 			break;
 		case CLOSURE_BSDF_WESTIN_SHEEN_ID:
 			label = bsdf_westin_sheen_sample(sc, sd->Ng, sd->I, sd->dI.dx, sd->dI.dy, randu, randv,
 				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
-			break;*/
+			break;
 #endif
 		default:
 			label = LABEL_NONE;
@@ -165,12 +165,12 @@ __device float3 bsdf_eval(KernelGlobals *kg, const ShaderData *sd, const ShaderC
 			case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
 				eval = bsdf_ashikhmin_velvet_eval_reflect(sc, sd->I, omega_in, pdf);
 				break;
-			/*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+			case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
 				eval = bsdf_westin_backscatter_eval_reflect(sc, sd->I, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_WESTIN_SHEEN_ID:
 				eval = bsdf_westin_sheen_eval_reflect(sc, sd->I, omega_in, pdf);
-				break;*/
+				break;
 #endif
 			default:
 				eval = make_float3(0.0f, 0.0f, 0.0f);
@@ -214,12 +214,12 @@ __device float3 bsdf_eval(KernelGlobals *kg, const ShaderData *sd, const ShaderC
 			case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
 				eval = bsdf_ashikhmin_velvet_eval_transmit(sc, sd->I, omega_in, pdf);
 				break;
-			/*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+			case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
 				eval = bsdf_westin_backscatter_eval_transmit(sc, sd->I, omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_WESTIN_SHEEN_ID:
 				eval = bsdf_westin_sheen_eval_transmit(sc, sd->I, omega_in, pdf);
-				break;*/
+				break;
 #endif
 			default:
 				eval = make_float3(0.0f, 0.0f, 0.0f);
@@ -281,12 +281,12 @@ __device void bsdf_blur(KernelGlobals *kg, ShaderClosure *sc, float roughness)
 		case CLOSURE_BSDF_ASHIKHMIN_VELVET_ID:
 			bsdf_ashikhmin_velvet_blur(sc, roughness);
 			break;
-		/*case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
+		case CLOSURE_BSDF_WESTIN_BACKSCATTER_ID:
 			bsdf_westin_backscatter_blur(sc, roughness);
 			break;
 		case CLOSURE_BSDF_WESTIN_SHEEN_ID:
 			bsdf_westin_sheen_blur(sc, roughness);
-			break;*/
+			break;
 #endif
 		default:
 			break;
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index be1e1c68bc9..0ce40eda4df 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -17,7 +17,6 @@ set(SRC
 	bsdf_diffuse_ramp.cpp
 	bsdf_phong_ramp.cpp
 	bsdf_toon.cpp
-	bsdf_westin.cpp
 	emissive.cpp
 	osl_bssrdf.cpp
 	osl_closures.cpp
diff --git a/intern/cycles/kernel/osl/bsdf_westin.cpp b/intern/cycles/kernel/osl/bsdf_westin.cpp
deleted file mode 100644
index d8129b1ce7c..00000000000
--- a/intern/cycles/kernel/osl/bsdf_westin.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Adapted from Open Shading Language with this license:
- *
- * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
- * All Rights Reserved.
- *
- * Modifications Copyright 2011, Blender Foundation.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * * Neither the name of Sony Pictures Imageworks nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <OpenImageIO/fmath.h>
-
-#include <OSL/genclosure.h>
-
-#include "osl_closures.h"
-
-#include "kernel_types.h"
-#include "kernel_montecarlo.h"
-#include "closure/bsdf_westin.h"
-
-CCL_NAMESPACE_BEGIN
-
-using namespace OSL;
-
-/* WESTIN BACKSCATTER */
-
-class WestinBackscatterClosure : public CBSDFClosure {
-public:
-	WestinBackscatterClosure() : CBSDFClosure(LABEL_GLOSSY) {}
-
-	size_t memsize() const { return sizeof(*this); }
-	const char *name() const { return "westin_backscatter"; }
-
-	void setup()
-	{
-		sc.prim = this;
-		m_shaderdata_flag = bsdf_westin_backscatter_setup(&sc);
-	}
-
-	bool mergeable(const ClosurePrimitive *other) const
-	{
-		return false;
-	}
-
-	void blur(float roughness)
-	{
-		bsdf_westin_backscatter_blur(&sc, roughness);
-	}
-
-	void print_on(std::ostream &out) const
-	{
-		out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " << sc.N[2] << "))";
-	}
-
-	float3 eval_reflect(const float3 &omega_out, const float3 &omega_in, float& pdf) const
-	{
-		return bsdf_westin_backscatter_eval_reflect(&sc, omega_out, omega_in, &pdf);
-	}
-
-	float3 eval_transmit(const float3 &omega_out, const float3 &omega_in, float& pdf) const
-	{
-		return bsdf_westin_backscatter_eval_transmit(&sc, omega_out, omega_in, &pdf);
-	}
-
-	int sample(const float3 &Ng,
-	           const float3 &omega_out, const float3 &domega_out_dx, const float3 &domega_out_dy,
-	           float randu, float randv,
-	           float3 &omega_in, float3 &domega_in_dx, float3 &domega_in_dy,
-	           float &pdf, float3 &eval) const
-	{
-		return bsdf_westin_backscatter_sample(&sc, Ng, omega_out, domega_out_dx, domega_out_dy,
-			randu, randv, &eval, &omega_in, &domega_in_dx, &domega_in_dy, &pdf);
-	}
-};
-
-ClosureParam *closure_westin_backscatter_params()
-{
-	static ClosureParam params[] = {
-		CLOSURE_FLOAT3_PARAM(WestinBackscatterClosure, sc.N),
-		CLOSURE_FLOAT_PARAM(WestinBackscatterClosure, sc.data0),
-		CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(WestinBackscatterClosure)
-	};
-	return params;
-}
-
-CLOSURE_PREPARE(closure_westin_backscatter_prepare, WestinBackscatterClosure)
-
-/* WESTIN SHEEN */
-
-class WestinSheenClosure : public CBSDFClosure {
-public:
-	WestinSheenClosure() : CBSDFClosure(LABEL_DIFFUSE) {}
-
-	size_t memsize() const { return sizeof(*this); }
-	const char *name() const { return "westin_sheen"; }
-
-	void setup()
-	{
-		sc.prim = this;
-		m_shaderdata_flag = bsdf_westin_sheen_setup(&sc);
-	}
-
-	bool mergeable(const ClosurePrimitive *other) const
-	{
-		return false;
-	}
-
-	void blur(float roughness)
-	{
-		bsdf_westin_sheen_blur(&sc, roughness);
-	}
-
-	void print_on(std::ostream &out) const
-	{
-		out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " << sc.N[2] << "))";
-	}
-
-	float3 eval_reflect(const float3 &omega_out, const float3 &omega_in, float& pdf) const
-	{
-		return bsdf_westin_sheen_eval_reflect(&sc, omega_out, omega_in, &pdf);
-	}
-
-	float3 eval_transmit(const float3 &omega_out, const float3 &omega_in, float& pdf) const
-	{
-		return bsdf_westin_sheen_eval_transmit(&sc, omega_out, omega_in, &pdf);
-	}
-
-	int sample(const float3 &Ng,
-	           const float3 &omega_out, const float3 &domega_out_dx, const float3 &domega_out_dy,
-	           float randu, float randv,
-	           float3 &omega_in, float3 &domega_in_dx, float3 &domega_in_dy,
-	           float &pdf, float3 &eval) const
-	{
-		return bsdf_westin_sheen_sample(&sc, Ng, omega_out, domega_out_dx, domega_out_dy,
-			randu, randv, &eval, &omega_in, &domega_in_dx, &domega_in_dy, &pdf);
-	}
-};
-
-ClosureParam *closure_westin_sheen_params()
-{
-	static ClosureParam params[] = {
-		CLOSURE_FLOAT3_PARAM(WestinSheenClosure, sc.N),
-		CLOSURE_FLOAT_PARAM(WestinSheenClosure, sc.data0),
-		CLOSURE_STRING_KEYPARAM("label"),
-	    CLOSURE_FINISH_PARAM(WestinSheenClosure)
-	};
-	return params;
-}
-
-CLOSURE_PREPARE(closure_westin_sheen_prepare, WestinSheenClosure)
-
-
-CCL_NAMESPACE_END
-