Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/cycles/kernel/closure/bsdf_microfacet_util.h')
-rw-r--r--intern/cycles/kernel/closure/bsdf_microfacet_util.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_microfacet_util.h b/intern/cycles/kernel/closure/bsdf_microfacet_util.h
index a5c77763133..b531c192e03 100644
--- a/intern/cycles/kernel/closure/bsdf_microfacet_util.h
+++ b/intern/cycles/kernel/closure/bsdf_microfacet_util.h
@@ -92,7 +92,7 @@ ccl_device_forceinline float microfacet_ggx_glass_E(KernelGlobals kg,
kernel_data.tables.ggx_glass_E_offset;
float x = mu, y = 1 - rough;
- float z = sqrtf(0.5f * ((inv_table? 1.0f / ior : ior) - 1.0f));
+ float z = sqrtf(0.5f * ((inv_table ? 1.0f / ior : ior) - 1.0f));
return lookup_table_read_3D(kg, x, y, z, offset, 16, 16, 16);
}
@@ -109,7 +109,7 @@ ccl_device_forceinline float microfacet_ggx_dielectric_E(KernelGlobals kg,
float F0 = fresnel_dielectric_cos(1.0f, ior);
float x = mix(mu, inverse_lerp(1.0f, F0, macro_fresnel), 0.5f);
float y = 1 - rough;
- float z = sqrtf(0.5f * ((inv_table? 1.0f / ior : ior) - 1.0f));
+ float z = sqrtf(0.5f * ((inv_table ? 1.0f / ior : ior) - 1.0f));
return lookup_table_read_3D(kg, x, y, z, offset, 16, 16, 16);
}
@@ -131,14 +131,14 @@ ccl_device_forceinline float clearcoat_E(KernelGlobals kg, float mu, float rough
return table * fresnel_dielectric_cos(mu, 1.5f);
}
-ccl_device_inline float3 fresnel_metallic_Fss(float3 F0, float3 B)
+ccl_device_inline Spectrum fresnel_metallic_Fss(Spectrum F0, Spectrum B)
{
- return saturate(mix(F0, one_float3(), 1.0f / 21.0f) - B * (1.0f / 126.0f));
+ return saturate(mix(F0, one_spectrum(), 1.0f / 21.0f) - B * (1.0f / 126.0f));
}
-ccl_device_inline float3 schlick_fresnel_Fss(float3 F0)
+ccl_device_inline Spectrum schlick_fresnel_Fss(Spectrum F0)
{
- return saturate(mix(F0, one_float3(), 1.0f / 21.0f));
+ return saturate(mix(F0, one_spectrum(), 1.0f / 21.0f));
}
/* TODO Imageworks source */