[Bf-blender-cvs] [9495775] experimental-build: Revert "Squashed commit of the following:"

Pascal Schoen noreply at git.blender.org
Tue Aug 16 15:25:33 CEST 2016


Commit: 9495775ce1bf9cff94d05603f6286697c13fed48
Author: Pascal Schoen
Date:   Tue Aug 16 15:25:04 2016 +0200
Branches: experimental-build
https://developer.blender.org/rB9495775ce1bf9cff94d05603f6286697c13fed48

Revert "Squashed commit of the following:"

This reverts commit 316edc16acfa01bc23b9e2c3c2b18e4f43dc3314.

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

M	intern/cycles/blender/blender_shader.cpp
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/closure/bsdf.h
D	intern/cycles/kernel/closure/bsdf_disney_clearcoat.h
D	intern/cycles/kernel/closure/bsdf_disney_diffuse.h
D	intern/cycles/kernel/closure/bsdf_disney_sheen.h
D	intern/cycles/kernel/closure/bsdf_disney_specular.h
M	intern/cycles/kernel/closure/bsdf_microfacet.h
M	intern/cycles/kernel/closure/bsdf_microfacet_multi.h
M	intern/cycles/kernel/closure/bsdf_microfacet_multi_impl.h
M	intern/cycles/kernel/closure/bsdf_util.h
M	intern/cycles/kernel/closure/bssrdf.h
M	intern/cycles/kernel/kernel_subsurface.h
D	intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp
D	intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp
D	intern/cycles/kernel/osl/bsdf_disney_specular.cpp
M	intern/cycles/kernel/osl/osl_bssrdf.cpp
M	intern/cycles/kernel/osl/osl_closures.cpp
M	intern/cycles/kernel/osl/osl_shader.cpp
M	intern/cycles/kernel/shaders/CMakeLists.txt
D	intern/cycles/kernel/shaders/node_disney_bsdf.osl
M	intern/cycles/kernel/shaders/stdosl.h
M	intern/cycles/kernel/svm/svm_closure.h
M	intern/cycles/kernel/svm/svm_types.h
M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/nodes.h
M	release/scripts/startup/nodeitems_builtins.py
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/intern/node.c
M	source/blender/gpu/shaders/gpu_shader_material.glsl
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/NOD_shader.h
M	source/blender/nodes/NOD_static_types.h
D	source/blender/nodes/shader/nodes/node_shader_bsdf_disney.c

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

diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index 171b824..534bc6c 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -517,9 +517,6 @@ static ShaderNode *add_node(Scene *scene,
 		}
 		node = hair;
 	}
-	else if(b_node.is_a(&RNA_ShaderNodeBsdfDisney)) {
-		node = new DisneyBsdfNode();
-    }
 	else if(b_node.is_a(&RNA_ShaderNodeBsdfTranslucent)) {
 		node = new TranslucentBsdfNode();
 	}
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 1bb93c7..9317bfb 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -107,10 +107,6 @@ set(SRC_CLOSURE_HEADERS
 	closure/bssrdf.h
 	closure/emissive.h
 	closure/volume.h
-    closure/bsdf_disney_diffuse.h
-    closure/bsdf_disney_sheen.h
-    closure/bsdf_disney_specular.h
-    closure/bsdf_disney_clearcoat.h
 )
 
 set(SRC_SVM_HEADERS
diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index ac4f528..1e7fbdb 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -27,10 +27,6 @@
 #include "../closure/bsdf_ashikhmin_shirley.h"
 #include "../closure/bsdf_toon.h"
 #include "../closure/bsdf_hair.h"
-#include "../closure/bsdf_disney_diffuse.h"
-#include "../closure/bsdf_disney_sheen.h"
-#include "../closure/bsdf_disney_specular.h"
-#include "../closure/bsdf_disney_clearcoat.h"
 #ifdef __SUBSURFACE__
 #  include "../closure/bssrdf.h"
 #endif
@@ -95,7 +91,6 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
 			label = bsdf_microfacet_ggx_sample(kg, sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
 				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
 			break;
-		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_REFRACTION_ID:
 		case CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID:
 			label = bsdf_microfacet_multi_ggx_sample(kg, sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
 			        eval, omega_in,  &domega_in->dx, &domega_in->dy, pdf, &ccl_fetch(sd, lcg_state));
@@ -135,23 +130,6 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
 			label = bsdf_hair_transmission_sample(sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
 				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
 			break;
-		case CLOSURE_BSDF_DISNEY_DIFFUSE_ID:
-		case CLOSURE_BSDF_BSSRDF_DISNEY_ID:
-			label = bsdf_disney_diffuse_sample(sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
-				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
-			break;
-		case CLOSURE_BSDF_DISNEY_SHEEN_ID:
-			label = bsdf_disney_sheen_sample(sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
-				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
-			break;
-		/*case CLOSURE_BSDF_DISNEY_SPECULAR_ID:
-			label = bsdf_disney_specular_sample(sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
-				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
-			break;*/
-		case CLOSURE_BSDF_DISNEY_CLEARCOAT_ID:
-			label = bsdf_disney_clearcoat_sample(sc, ccl_fetch(sd, Ng), ccl_fetch(sd, I), ccl_fetch(sd, dI).dx, ccl_fetch(sd, dI).dy, randu, randv,
-				eval, omega_in, &domega_in->dx, &domega_in->dy, pdf);
-			break;
 #endif
 #ifdef __VOLUME__
 		case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
@@ -244,19 +222,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 			case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
 				eval = bsdf_hair_transmission_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
 				break;
-			case CLOSURE_BSDF_DISNEY_DIFFUSE_ID:
-			case CLOSURE_BSDF_BSSRDF_DISNEY_ID:
-				eval = bsdf_disney_diffuse_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
-			case CLOSURE_BSDF_DISNEY_SHEEN_ID:
-				eval = bsdf_disney_sheen_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
-			/*case CLOSURE_BSDF_DISNEY_SPECULAR_ID:
-				eval = bsdf_disney_specular_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;*/
-			case CLOSURE_BSDF_DISNEY_CLEARCOAT_ID:
-				eval = bsdf_disney_clearcoat_eval_reflect(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
 #endif
 #ifdef __VOLUME__
 			case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
@@ -296,7 +261,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 				eval = bsdf_microfacet_ggx_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
 				break;
 			case CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID:
-			case CLOSURE_BSDF_MICROFACET_MULTI_GGX_REFRACTION_ID:
 				eval = bsdf_microfacet_multi_ggx_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf, &ccl_fetch(sd, lcg_state));
 				break;
 			case CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID:
@@ -326,19 +290,6 @@ float3 bsdf_eval(KernelGlobals *kg,
 			case CLOSURE_BSDF_HAIR_TRANSMISSION_ID:
 				eval = bsdf_hair_transmission_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
 				break;
-			case CLOSURE_BSDF_DISNEY_DIFFUSE_ID:
-			case CLOSURE_BSDF_BSSRDF_DISNEY_ID:
-				eval = bsdf_disney_diffuse_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
-			case CLOSURE_BSDF_DISNEY_SHEEN_ID:
-				eval = bsdf_disney_sheen_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
-			/*case CLOSURE_BSDF_DISNEY_SPECULAR_ID:
-				eval = bsdf_disney_specular_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;*/
-			case CLOSURE_BSDF_DISNEY_CLEARCOAT_ID:
-				eval = bsdf_disney_clearcoat_eval_transmit(sc, ccl_fetch(sd, I), omega_in, pdf);
-				break;
 #endif
 #ifdef __VOLUME__
 			case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
diff --git a/intern/cycles/kernel/closure/bsdf_disney_clearcoat.h b/intern/cycles/kernel/closure/bsdf_disney_clearcoat.h
deleted file mode 100644
index cdb8b3e..0000000
--- a/intern/cycles/kernel/closure/bsdf_disney_clearcoat.h
+++ /dev/null
@@ -1,200 +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.
- */
-
-#ifndef __BSDF_DISNEY_CLEARCOAT_H__
-#define __BSDF_DISNEY_CLEARCOAT_H__
-
-CCL_NAMESPACE_BEGIN
-
-typedef ccl_addr_space struct DisneyClearcoatBsdf {
-	SHADER_CLOSURE_BASE;
-
-	float clearcoat, clearcoatGloss, clearcoatRoughness;
-	float3 N;
-} DisneyClearcoatBsdf;
-
-ccl_device int bsdf_disney_clearcoat_setup(DisneyClearcoatBsdf *bsdf)
-{
-	/* clearcoat roughness */
-	bsdf->clearcoatRoughness = 0.1f * (1.0f - bsdf->clearcoatGloss) + 0.001f * bsdf->clearcoatGloss; // lerp(0.1f, 0.001f, sc->data1/*clearcoatGloss*/); // 
-
-    bsdf->type = CLOSURE_BSDF_DISNEY_CLEARCOAT_ID;
-    return SD_BSDF|SD_BSDF_HAS_EVAL;
-}
-
-ccl_device float3 bsdf_disney_clearcoat_eval_reflect(const ShaderClosure *sc, const float3 I,
-    const float3 omega_in, float *pdf)
-{
-	const DisneyClearcoatBsdf *bsdf = (const DisneyClearcoatBsdf *)sc;
-
-	if (bsdf->clearcoat > 0.0f) {
-		float alpha = bsdf->clearcoatRoughness;
-		float3 N = bsdf->N;
-
-		if (alpha <= 1e-4f)
-			return make_float3(0.0f, 0.0f, 0.0f);
-
-		float cosNO = dot(N, I);
-		float cosNI = dot(N, omega_in);
-
-		if (cosNI > 0 && cosNO > 0) {
-			/* get half vector */
-			float3 m = normalize(omega_in + I);
-			float alpha2 = alpha * alpha;
-			float D, G1o, G1i;
-
-			/* isotropic
-				* eq. 20: (F*G*D)/(4*in*on)
-				* eq. 33: first we calculate D(m) */
-			float cosThetaM = dot(N, m);
-			float cosThetaM2 = cosThetaM * cosThetaM;
-			D = (alpha2 - 1) / (M_PI_F * logf(alpha2) * (1 + (alpha2 - 1) * cosThetaM2));
-
-			/* eq. 34: now calculate G1(i,m) and G1(o,m) */
-			G1o = 2 / (1 + safe_sqrtf(1 + 0.0625f * (1 - cosNO * cosNO) / (cosNO * cosNO)));
-			G1i = 2 / (1 + safe_sqrtf(1 + 0.0625f * (1 - cosNI * cosNI) / (cosNI * cosNI)));
-
-			float G = G1o * G1i;
-
-			/* eq. 20 */
-			float common = D * 0.25f / cosNO;
-
-			float FH = schlick_fresnel(dot(omega_in, m));
-			float3 F = (0.04f * (1.0f - FH) + 1.0f * FH) * 0.25f * bsdf->clearcoat * make_float3(1.0f, 1.0f, 1.0f); // lerp(make_float3(0.04f, 0.04f, 0.04f), make_float3(1.0f, 1.0f, 1.0f), FH);
-
-			float3 out = F * G * common;
-
-			/* eq. 2 in distribution of visible normals sampling
-			 * pm = Dw = G1o * dot(m, I) * D / dot(N, I); */
-
-			/* eq. 38 - but see also:
-			 * eq. 17 in http://www.graphics.cornell.edu/~bjw/wardnotes.pdf
-			 * pdf = pm * 0.25 / dot(m, I); */
-			*pdf = G1o * common;
-
-			return out;
-		}
-	}
-
-	return make_float3(0.0f, 0.0f, 0.0f);
-}
-
-ccl_device float3 bsdf_disney_clearcoat_eval_transmit(const ShaderClosure *sc, co

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list