Commit: 17f015bc6c5268b54517c5b9f6f604a84c7c42c7
Author: Pascal Schoen
Date: Tue Sep 27 09:20:49 2016 +0200
Branches: experimental-build
https://developer.blender.org/rB17f015bc6c5268b54517c5b9f6f604a84c7c42c7
Revert "Squashed commit of the following:"
This reverts commit da0f94d4c814358e3851e981a2e5c0469a3bcfa8.
===================================================================
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_diffuse.h
D intern/cycles/kernel/closure/bsdf_disney_sheen.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_reflection.h
M intern/cycles/kernel/closure/bsdf_util.h
M intern/cycles/kernel/closure/bssrdf.h
M intern/cycles/kernel/kernel_subsurface.h
M intern/cycles/kernel/osl/osl_bssrdf.cpp
M intern/cycles/kernel/osl/osl_closures.cpp
M intern/cycles/kernel/osl/osl_closures.h
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/graph.cpp
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/editors/space_node/drawnode.c
M source/blender/gpu/shaders/gpu_shader_material.glsl
M source/blender/makesrna/intern/rna_nodetree.c
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 fc13fae..534bc6c 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -517,19 +517,6 @@ static ShaderNode *add_node(Scene *scene,
}
node = hair;
}
- else if(b_node.is_a(&RNA_ShaderNodeBsdfDisney)) {
- BL::ShaderNodeBsdfDisney b_disney_node(b_node);
- DisneyBsdfNode *disney = new DisneyBsdfNode();
- switch (b_disney_node.distribution()) {
- case BL::ShaderNodeBsdfDisney::distribution_GGX:
- disney->distribution =
CLOSURE_BSDF_MICROFACET_GGX_GLASS_ID;
- break;
- case BL::ShaderNodeBsdfDisney::distribution_MULTI_GGX:
- disney->distribution =
CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID;
- break;
- }
- node = disney;
- }
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 cad0a84..06089b4 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -108,8 +108,6 @@ set(SRC_CLOSURE_HEADERS
closure/bssrdf.h
closure/emissive.h
closure/volume.h
- closure/bsdf_disney_diffuse.h
- closure/bsdf_disney_sheen.h
)
set(SRC_SVM_HEADERS
diff --git a/intern/cycles/kernel/closure/bsdf.h
b/intern/cycles/kernel/closure/bsdf.h
index 97bdf9c..1e7fbdb 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -27,8 +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"
#ifdef __SUBSURFACE__
# include "../closure/bssrdf.h"
#endif
@@ -93,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));
@@ -133,15 +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;
#endif
#ifdef __VOLUME__
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
@@ -234,13 +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;
#endif
#ifdef __VOLUME__
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
@@ -280,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:
@@ -310,13 +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;
#endif
#ifdef __VOLUME__
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
diff --git a/intern/cycles/kernel/closure/bsdf_disney_diffuse.h
b/intern/cycles/kernel/closure/bsdf_disney_diffuse.h
deleted file mode 100644
index faeb001..0000000
--- a/intern/cycles/kernel/closure/bsdf_disney_diffuse.h
+++ /dev/null
@@ -1,138 +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_DIFFUSE_H__
-#define __BSDF_DISNEY_DIFFUSE_H__
-
-CCL_NAMESPACE_BEGIN
-
-typedef ccl_addr_space struct DisneyDiffuseBsdf {
- SHADER_CLOSURE_BASE;
-
- float roughness;
- float3 N;
- float3 baseColor;
-} DisneyDiffuseBsdf;
-
-ccl_device float3 calculate_disney_diffuse_brdf(const DisneyDiffuseBsdf *bsdf,
- float3 N, float3 V, float3 L, float3 H, float *pdf)
-{
- float NdotL = max(dot(N, L), 0.0f);
- float NdotV = max(dot(N, V), 0.0f);
-
- if (NdotL < 0 || NdotV < 0) {
- *pdf = 0.0f;
- return make_float3(0.0f, 0.0f, 0.0f);
- }
-
- float LdotH = dot(L, H);
-
- float FL = schlick_fresnel(NdotL), FV = schlick_fresnel(NdotV);
- const float Fd90 = 0.5f + 2.0f * LdotH*LdotH * bsdf->roughness;
- float Fd = (1.0f * (1.0f - FL) + Fd90 * FL) * (1.0f * (1.0f - FV) +
Fd90 * FV); //lerp(1.0f, Fd90, FL) * lerp(1.0f, Fd90, FV);
-
- float3 value = M_1_PI_F * Fd * bsdf->baseColor;
-
- *pdf = M_1_PI_F * 0.5f;
-
- value *= NdotL;
-
- return value;
-}
-
-ccl_device int bsdf_disney_diffuse_setup(DisneyDiffuseBsdf *bsdf)
-{
- bsdf->type = CLOSURE_BSDF_DISNEY_DIFFUSE_ID;
- return SD_BSDF|SD_BSDF_HAS_EVAL;
-}
-
-ccl_device float3 bsdf_disney_diffuse_eval_reflect(const ShaderClosure *sc,
const float3 I,
- const float3 omega_in, float *pdf)
-{
- const DisneyDiffuseBsdf *bsdf = (const DisneyDiffuseBsdf *)sc;
-
- float3 N = normalize(bsdf->N);
- float3 V = I; // outgoing
- float3 L = omega_in; // incoming
- float3 H = normalize(L + V);
-
- if (dot(bsdf->N, omega_in) > 0.0f) {
- float3 value = calculate_disney_diffuse_brdf(bsdf, N, V, L, H, pdf);
-
- return value;
- }
- else {
- *pdf = 0.0f;
- return make_float3(0.0f, 0.0f, 0.0f);
- }
-}
-
-ccl_device float3 bsdf_disney_diffuse_eval_transmit(const ShaderClosure *sc,
const float3 I,
- const float3 omega_in, float *pdf)
-{
- return make_float3(0.0f, 0.0f, 0.0f);
-}
-
-ccl_device int bsdf_disney_diffuse_sample(const ShaderClosure *sc,
- float3 Ng, float3 I, float3 dIdx, float3 dIdy, float randu, float randv,
- float3 *eval, float3 *omega_in, float3 *domega_in_dx,
- float3 *domega_in_dy, float *pdf)
-{
- const DisneyDiffuseBsdf *bsdf = (const DisneyDiffuseBsdf *)sc;
-
- float3 N = normalize(bsdf->N);
-
- sample_uniform_hemisphere(N, randu, randv, omega_in, pdf);
-
- if (dot(Ng, *omega_in) > 0) {
- float3 H = normalize(I + *omega_in);
-
- *eval = calculate_disney_diffuse_brdf(bsdf, N, I, *omega_in, H,
pdf);
-
-#ifdef __RAY_DIFFERENTIALS__
- // TODO: find a better approximation for the diffuse bounce
- *domega_in_dx = -((2 * dot(N, dIdx)) * N - dIdx);
- *domega_in_dy = -((2 * dot(N, dIdy)) * N - dIdy);
-#endif
- }
- else {
- *pdf = 0;
- }
- return LABEL_REFLECT|LABEL_DIFFUSE;
-}
-
-CCL_NAMESPACE_END
-
-#endif /* __BSDF_DISNEY_DIFFUSE_H__ */
-
-
diff --git a/intern/cycles/kernel/closure/bsdf_disney_sheen.h
b/intern/cycles/kernel/closure/bsdf_disney_sheen.h
deleted file mode 100644
index 9e25794..0000000
--- a/intern/cycles/kernel/closure/bsdf_disney_sheen.h
+++ /dev/null
@@ -1,143 +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
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
