Cycles: Drop old OSL closure compatibility code.
This was added to keep custom OSL scripts with Toon and SSS closure calls working. 1 year after the change, we can drop the compatibility code now.
This commit is contained in:
parent
dadf31f0b8
commit
6cff19a0bf
|
@ -62,18 +62,6 @@ public:
|
|||
};
|
||||
|
||||
ClosureParam *closure_bssrdf_cubic_params()
|
||||
{
|
||||
static ClosureParam params[] = {
|
||||
CLOSURE_FLOAT3_PARAM(CubicBSSRDFClosure, sc.N),
|
||||
CLOSURE_FLOAT3_PARAM(CubicBSSRDFClosure, radius),
|
||||
//CLOSURE_FLOAT_PARAM(CubicBSSRDFClosure, sc.data1),
|
||||
CLOSURE_STRING_KEYPARAM("label"),
|
||||
CLOSURE_FINISH_PARAM(CubicBSSRDFClosure)
|
||||
};
|
||||
return params;
|
||||
}
|
||||
|
||||
ClosureParam *closure_bssrdf_cubic_extended_params()
|
||||
{
|
||||
static ClosureParam params[] = {
|
||||
CLOSURE_FLOAT3_PARAM(CubicBSSRDFClosure, sc.N),
|
||||
|
@ -103,18 +91,6 @@ public:
|
|||
};
|
||||
|
||||
ClosureParam *closure_bssrdf_gaussian_params()
|
||||
{
|
||||
static ClosureParam params[] = {
|
||||
CLOSURE_FLOAT3_PARAM(GaussianBSSRDFClosure, sc.N),
|
||||
CLOSURE_FLOAT3_PARAM(GaussianBSSRDFClosure, radius),
|
||||
//CLOSURE_FLOAT_PARAM(GaussianBSSRDFClosure, sc.data1),
|
||||
CLOSURE_STRING_KEYPARAM("label"),
|
||||
CLOSURE_FINISH_PARAM(GaussianBSSRDFClosure)
|
||||
};
|
||||
return params;
|
||||
}
|
||||
|
||||
ClosureParam *closure_bssrdf_gaussian_extended_params()
|
||||
{
|
||||
static ClosureParam params[] = {
|
||||
CLOSURE_FLOAT3_PARAM(GaussianBSSRDFClosure, sc.N),
|
||||
|
|
|
@ -244,8 +244,6 @@ void OSLShader::register_closures(OSLShadingSystem *ss_)
|
|||
bsdf_diffuse_toon_params(), bsdf_diffuse_toon_prepare);
|
||||
register_closure(ss, "glossy_toon", id++,
|
||||
bsdf_glossy_toon_params(), bsdf_glossy_toon_prepare);
|
||||
register_closure(ss, "specular_toon", id++,
|
||||
bsdf_glossy_toon_params(), bsdf_glossy_toon_prepare);
|
||||
register_closure(ss, "westin_backscatter", id++,
|
||||
bsdf_westin_backscatter_params(), bsdf_westin_backscatter_prepare);
|
||||
register_closure(ss, "westin_sheen", id++,
|
||||
|
@ -267,10 +265,6 @@ void OSLShader::register_closures(OSLShadingSystem *ss_)
|
|||
closure_bssrdf_cubic_params(), closure_bssrdf_cubic_prepare);
|
||||
register_closure(ss, "bssrdf_gaussian", id++,
|
||||
closure_bssrdf_gaussian_params(), closure_bssrdf_gaussian_prepare);
|
||||
register_closure(ss, "bssrdf_cubic", id++,
|
||||
closure_bssrdf_cubic_extended_params(), closure_bssrdf_cubic_prepare);
|
||||
register_closure(ss, "bssrdf_gaussian", id++,
|
||||
closure_bssrdf_gaussian_extended_params(), closure_bssrdf_gaussian_prepare);
|
||||
|
||||
register_closure(ss, "hair_reflection", id++,
|
||||
bsdf_hair_reflection_params(), bsdf_hair_reflection_prepare);
|
||||
|
|
|
@ -52,8 +52,6 @@ OSL::ClosureParam *closure_westin_backscatter_params();
|
|||
OSL::ClosureParam *closure_westin_sheen_params();
|
||||
OSL::ClosureParam *closure_bssrdf_cubic_params();
|
||||
OSL::ClosureParam *closure_bssrdf_gaussian_params();
|
||||
OSL::ClosureParam *closure_bssrdf_cubic_extended_params();
|
||||
OSL::ClosureParam *closure_bssrdf_gaussian_extended_params();
|
||||
OSL::ClosureParam *closure_henyey_greenstein_volume_params();
|
||||
|
||||
void closure_emission_prepare(OSL::RendererServices *, int id, void *data);
|
||||
|
|
|
@ -507,11 +507,6 @@ closure color hair_transmission(normal N, float roughnessu, float roughnessv, ve
|
|||
closure color henyey_greenstein(float g) BUILTIN;
|
||||
closure color absorption() BUILTIN;
|
||||
|
||||
// Backwards compatibility
|
||||
closure color bssrdf_cubic(normal N, vector radius) BUILTIN;
|
||||
closure color bssrdf_gaussian(normal N, vector radius) BUILTIN;
|
||||
closure color specular_toon(normal N, float size, float smooth) BUILTIN;
|
||||
|
||||
// Renderer state
|
||||
int raytype (string typename) BUILTIN;
|
||||
// the individual 'isFOOray' functions are deprecated
|
||||
|
|
Loading…
Reference in New Issue