diff options
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 65 |
1 files changed, 24 insertions, 41 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 18e8fee4348..f2be61eb535 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -146,7 +146,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, if (closure->type == OSL::ClosureColor::COMPONENT) { OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure; - OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data(); + CClosurePrimitive *prim = (CClosurePrimitive *)comp->data(); if (prim) { ShaderClosure sc; @@ -156,8 +156,10 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, sc.weight = weight; #endif - switch (prim->category()) { - case OSL::ClosurePrimitive::BSDF: { + prim->setup(); + + switch (prim->category) { + case CClosurePrimitive::BSDF: { CBSDFClosure *bsdf = (CBSDFClosure *)prim; int scattering = bsdf->scattering(); @@ -191,7 +193,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, } break; } - case OSL::ClosurePrimitive::Emissive: { + case CClosurePrimitive::Emissive: { /* sample weight */ float sample_weight = fabsf(average(weight)); @@ -208,7 +210,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, } break; } - case AmbientOcclusion: { + case CClosurePrimitive::AmbientOcclusion: { /* sample weight */ float sample_weight = fabsf(average(weight)); @@ -224,7 +226,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, } break; } - case OSL::ClosurePrimitive::Holdout: { + case CClosurePrimitive::Holdout: { sc.sample_weight = 0.0f; sc.type = CLOSURE_HOLDOUT_ID; sc.data0 = 0.0f; @@ -237,7 +239,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, } break; } - case OSL::ClosurePrimitive::BSSRDF: { + case CClosurePrimitive::BSSRDF: { CBSSRDFClosure *bssrdf = (CBSSRDFClosure *)prim; float sample_weight = fabsf(average(weight)); @@ -280,10 +282,8 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag, } break; } - case OSL::ClosurePrimitive::Debug: - break; /* not implemented */ - case OSL::ClosurePrimitive::Background: - case OSL::ClosurePrimitive::Volume: + case CClosurePrimitive::Background: + case CClosurePrimitive::Volume: break; /* not relevant */ } } @@ -332,9 +332,9 @@ static float3 flatten_background_closure_tree(const OSL::ClosureColor *closure) if (closure->type == OSL::ClosureColor::COMPONENT) { OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure; - OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data(); + CClosurePrimitive *prim = (CClosurePrimitive *)comp->data(); - if (prim && prim->category() == OSL::ClosurePrimitive::Background) + if (prim && prim->category == CClosurePrimitive::Background) #ifdef OSL_SUPPORTS_WEIGHTED_CLOSURE_COMPONENTS return TO_FLOAT3(comp->w); #else @@ -387,7 +387,7 @@ static void flatten_volume_closure_tree(ShaderData *sd, if (closure->type == OSL::ClosureColor::COMPONENT) { OSL::ClosureComponent *comp = (OSL::ClosureComponent *)closure; - OSL::ClosurePrimitive *prim = (OSL::ClosurePrimitive *)comp->data(); + CClosurePrimitive *prim = (CClosurePrimitive *)comp->data(); if (prim) { ShaderClosure sc; @@ -397,8 +397,10 @@ static void flatten_volume_closure_tree(ShaderData *sd, sc.weight = weight; #endif - switch (prim->category()) { - case OSL::ClosurePrimitive::Volume: { + prim->setup(); + + switch (prim->category) { + case CClosurePrimitive::Volume: { /* sample weight */ float sample_weight = fabsf(average(weight)); @@ -413,13 +415,13 @@ static void flatten_volume_closure_tree(ShaderData *sd, sd->closure[sd->num_closure++] = sc; break; } - case OSL::ClosurePrimitive::Holdout: - case OSL::ClosurePrimitive::Debug: + case CClosurePrimitive::Holdout: break; /* not implemented */ - case OSL::ClosurePrimitive::Background: - case OSL::ClosurePrimitive::BSDF: - case OSL::ClosurePrimitive::Emissive: - case OSL::ClosurePrimitive::BSSRDF: + case CClosurePrimitive::Background: + case CClosurePrimitive::BSDF: + case CClosurePrimitive::Emissive: + case CClosurePrimitive::BSSRDF: + case CClosurePrimitive::AmbientOcclusion: break; /* not relevant */ } } @@ -509,25 +511,6 @@ void OSLShader::bsdf_blur(ShaderClosure *sc, float roughness) bsdf->blur(roughness); } -/* Emissive Closure */ - -float3 OSLShader::emissive_eval(const ShaderData *sd, const ShaderClosure *sc) -{ - OSL::EmissiveClosure *emissive = (OSL::EmissiveClosure *)sc->prim; - OSL::Color3 emissive_eval = emissive->eval(TO_VEC3(sd->Ng), TO_VEC3(sd->I)); - - return TO_FLOAT3(emissive_eval); -} - -/* Volume Closure */ - -float3 OSLShader::volume_eval_phase(const ShaderClosure *sc, const float3 omega_in, const float3 omega_out) -{ - OSL::VolumeClosure *volume = (OSL::VolumeClosure *)sc->prim; - OSL::Color3 volume_eval = volume->eval_phase(TO_VEC3(omega_in), TO_VEC3(omega_out)); - return TO_FLOAT3(volume_eval) * sc->weight; -} - /* Attributes */ int OSLShader::find_attribute(KernelGlobals *kg, const ShaderData *sd, uint id, AttributeElement *elem) |