Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Relative shader includes #926

Merged
merged 1 commit into from
May 2, 2022
Merged

Relative shader includes #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/lights/genglsl/lights_genglsl_impl.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<materialx version="1.38">

<!-- <point_light> -->
<implementation name="IM_point_light_genglsl" nodedef="ND_point_light" file="libraries/lights/genglsl/mx_point_light.glsl" function="mx_point_light" target="genglsl" />
<implementation name="IM_point_light_genglsl" nodedef="ND_point_light" file="mx_point_light.glsl" function="mx_point_light" target="genglsl" />

<!-- <directional_light> -->
<implementation name="IM_directional_light_genglsl" nodedef="ND_directional_light" file="libraries/lights/genglsl/mx_directional_light.glsl" function="mx_directional_light" target="genglsl" />
<implementation name="IM_directional_light_genglsl" nodedef="ND_directional_light" file="mx_directional_light.glsl" function="mx_directional_light" target="genglsl" />

<!-- <spot_light> -->
<implementation name="IM_spot_light_genglsl" nodedef="ND_spot_light" file="libraries/lights/genglsl/mx_spot_light.glsl" function="mx_spot_light" target="genglsl" />
<implementation name="IM_spot_light_genglsl" nodedef="ND_spot_light" file="mx_spot_light.glsl" function="mx_spot_light" target="genglsl" />

</materialx>
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "mx_microfacet_specular.glsl"

// https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html
// Section 20.4 Equation 13
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_environment_none.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "mx_microfacet_specular.glsl"

vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 roughness, int distribution, FresnelData fd)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "mx_microfacet_specular.glsl"

float mx_latlong_compute_lod(float alpha)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl"
#include "mx_microfacet.glsl"

// Based on the OSL implementation of Oren-Nayar diffuse, which is in turn
// based on https://mimosa-pudica.net/improved-oren-nayar.html.
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl"
#include "mx_microfacet.glsl"

// http://www.aconty.com/pdf/s2017_pbs_imageworks_sheen.pdf
// Equation 2
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl"
#include "mx_microfacet.glsl"

// Fresnel model options.
const int FRESNEL_MODEL_DIELECTRIC = 0;
Expand Down
4 changes: 2 additions & 2 deletions libraries/pbrlib/genglsl/lib/mx_table.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl"
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "mx_microfacet_sheen.glsl"
#include "mx_microfacet_specular.glsl"

vec3 mx_generate_dir_albedo_table()
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl"
#include "lib/mx_microfacet_diffuse.glsl"

void mx_burley_diffuse_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 normal, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "lib/mx_microfacet_specular.glsl"

void mx_conductor_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 ior_n, vec3 ior_k, vec2 roughness, vec3 N, vec3 X, int distribution, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "lib/mx_microfacet_specular.glsl"

void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl"
#include "lib/mx_microfacet_specular.glsl"

void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl"
#include "lib/mx_microfacet_diffuse.glsl"

void mx_oren_nayar_diffuse_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 normal, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl"
#include "lib/mx_microfacet_sheen.glsl"

void mx_sheen_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 N, inout BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl"
#include "lib/mx_microfacet_diffuse.glsl"

void mx_subsurface_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, vec3 radius, float anisotropy, vec3 normal, inout BSDF bsdf)
{
Expand Down
26 changes: 13 additions & 13 deletions libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
<materialx version="1.38">

<!-- <oren_nayar_diffuse_bsdf> -->
<implementation name="IM_oren_nayar_diffuse_bsdf_genglsl" nodedef="ND_oren_nayar_diffuse_bsdf" file="libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl" function="mx_oren_nayar_diffuse_bsdf" target="genglsl" />
<implementation name="IM_oren_nayar_diffuse_bsdf_genglsl" nodedef="ND_oren_nayar_diffuse_bsdf" file="mx_oren_nayar_diffuse_bsdf.glsl" function="mx_oren_nayar_diffuse_bsdf" target="genglsl" />

<!-- <burley_diffuse_bsdf> -->
<implementation name="IM_burley_diffuse_bsdf_genglsl" nodedef="ND_burley_diffuse_bsdf" file="libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl" function="mx_burley_diffuse_bsdf" target="genglsl" />
<implementation name="IM_burley_diffuse_bsdf_genglsl" nodedef="ND_burley_diffuse_bsdf" file="mx_burley_diffuse_bsdf.glsl" function="mx_burley_diffuse_bsdf" target="genglsl" />

<!-- <translucent_bsdf> -->
<implementation name="IM_translucent_bsdf_genglsl" nodedef="ND_translucent_bsdf" file="libraries/pbrlib/genglsl/mx_translucent_bsdf.glsl" function="mx_translucent_bsdf" target="genglsl" />
<implementation name="IM_translucent_bsdf_genglsl" nodedef="ND_translucent_bsdf" file="mx_translucent_bsdf.glsl" function="mx_translucent_bsdf" target="genglsl" />

<!-- <dielectric_bsdf> -->
<implementation name="IM_dielectric_bsdf_genglsl" nodedef="ND_dielectric_bsdf" file="libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl" function="mx_dielectric_bsdf" target="genglsl" />
<implementation name="IM_dielectric_bsdf_genglsl" nodedef="ND_dielectric_bsdf" file="mx_dielectric_bsdf.glsl" function="mx_dielectric_bsdf" target="genglsl" />

<!-- <conductor_bsdf> -->
<implementation name="IM_conductor_bsdf_genglsl" nodedef="ND_conductor_bsdf" file="libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl" function="mx_conductor_bsdf" target="genglsl" />
<implementation name="IM_conductor_bsdf_genglsl" nodedef="ND_conductor_bsdf" file="mx_conductor_bsdf.glsl" function="mx_conductor_bsdf" target="genglsl" />

<!-- <generalized_schlick_bsdf> -->
<implementation name="IM_generalized_schlick_bsdf_genglsl" nodedef="ND_generalized_schlick_bsdf" file="libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl" function="mx_generalized_schlick_bsdf" target="genglsl" />
<implementation name="IM_generalized_schlick_bsdf_genglsl" nodedef="ND_generalized_schlick_bsdf" file="mx_generalized_schlick_bsdf.glsl" function="mx_generalized_schlick_bsdf" target="genglsl" />

<!-- <subsurface_bsdf> -->
<implementation name="IM_subsurface_bsdf_genglsl" nodedef="ND_subsurface_bsdf" file="libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl" function="mx_subsurface_bsdf" target="genglsl" />
<implementation name="IM_subsurface_bsdf_genglsl" nodedef="ND_subsurface_bsdf" file="mx_subsurface_bsdf.glsl" function="mx_subsurface_bsdf" target="genglsl" />

<!-- <sheen_bsdf> -->
<implementation name="IM_sheen_bsdf_genglsl" nodedef="ND_sheen_bsdf" file="libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl" function="mx_sheen_bsdf" target="genglsl" />
<implementation name="IM_sheen_bsdf_genglsl" nodedef="ND_sheen_bsdf" file="mx_sheen_bsdf.glsl" function="mx_sheen_bsdf" target="genglsl" />

<!-- <anisotropic_vdf> -->
<implementation name="IM_anisotropic_vdf_genglsl" nodedef="ND_anisotropic_vdf" file="libraries/pbrlib/genglsl/mx_anisotropic_vdf.glsl" function="mx_anisotropic_vdf" target="genglsl" />
<implementation name="IM_anisotropic_vdf_genglsl" nodedef="ND_anisotropic_vdf" file="mx_anisotropic_vdf.glsl" function="mx_anisotropic_vdf" target="genglsl" />

<!-- <thin_film_bsdf> -->
<implementation name="IM_thin_film_bsdf_genglsl" nodedef="ND_thin_film_bsdf" target="genglsl" />
Expand All @@ -50,7 +50,7 @@
<implementation name="IM_multiply_edfF_genglsl" nodedef="ND_multiply_edfF" target="genglsl" />

<!-- <uniform_edf> -->
<implementation name="IM_uniform_edf_genglsl" nodedef="ND_uniform_edf" file="libraries/pbrlib/genglsl/mx_uniform_edf.glsl" function="mx_uniform_edf" target="genglsl" />
<implementation name="IM_uniform_edf_genglsl" nodedef="ND_uniform_edf" file="mx_uniform_edf.glsl" function="mx_uniform_edf" target="genglsl" />

<!-- <surface> -->
<implementation name="IM_surface_genglsl" nodedef="ND_surface" target="genglsl" />
Expand All @@ -59,12 +59,12 @@
<implementation name="IM_light_genglsl" nodedef="ND_light" target="genglsl" />

<!-- <roughness_anisotropy> -->
<implementation name="IM_roughness_anisotropy_genglsl" nodedef="ND_roughness_anisotropy" file="libraries/pbrlib/genglsl/mx_roughness_anisotropy.glsl" function="mx_roughness_anisotropy" target="genglsl" />
<implementation name="IM_roughness_anisotropy_genglsl" nodedef="ND_roughness_anisotropy" file="mx_roughness_anisotropy.glsl" function="mx_roughness_anisotropy" target="genglsl" />

<!-- <roughness_dual> -->
<implementation name="IM_roughness_dual_genglsl" nodedef="ND_roughness_dual" file="libraries/pbrlib/genglsl/mx_roughness_dual.glsl" function="mx_roughness_dual" target="genglsl" />
<implementation name="IM_roughness_dual_genglsl" nodedef="ND_roughness_dual" file="mx_roughness_dual.glsl" function="mx_roughness_dual" target="genglsl" />

<!-- <artistic_ior> -->
<implementation name="IM_artistic_ior_genglsl" nodedef="ND_artistic_ior" file="libraries/pbrlib/genglsl/mx_artistic_ior.glsl" function="mx_artistic_ior" target="genglsl" />
<implementation name="IM_artistic_ior_genglsl" nodedef="ND_artistic_ior" file="mx_artistic_ior.glsl" function="mx_artistic_ior" target="genglsl" />

</materialx>
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet.osl"
#include "mx_microfacet.osl"

// Rational curve fit approximation for the directional albedo of Imageworks sheen.
float mx_imageworks_sheen_dir_albedo_analytic(float NdotV, float roughness)
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet.osl"
#include "mx_microfacet.osl"

// Compute the average of an anisotropic alpha pair.
float mx_average_alpha(vector2 alpha)
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/mx_conductor_bsdf.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl"
#include "lib/mx_microfacet_specular.osl"

void mx_conductor_bsdf(float weight, color ior_n, color ior_k, vector2 roughness, normal N, vector U, string distribution, output BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/mx_dielectric_bsdf.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl"
#include "lib/mx_microfacet_specular.osl"

void mx_dielectric_bsdf(float weight, color tint, float ior, vector2 roughness, normal N, vector U, string distribution, string scatter_mode, output BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl"
#include "lib/mx_microfacet_specular.osl"

void mx_generalized_schlick_bsdf(float weight, color color0, color color90, float exponent, vector2 roughness, normal N, vector U, string distribution, string scatter_mode, output BSDF bsdf)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/pbrlib/genosl/mx_sheen_bsdf.osl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl"
#include "lib/mx_microfacet_sheen.osl"

// TODO: Vanilla OSL doesn't have a proper sheen closure,
// so use 'diffuse' scaled by sheen directional albedo for now.
Expand Down
32 changes: 16 additions & 16 deletions libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@
<materialx version="1.38">

<!-- <oren_nayar_diffuse_bsdf> -->
<implementation name="IM_oren_nayar_diffuse_bsdf_genosl" nodedef="ND_oren_nayar_diffuse_bsdf" file="libraries/pbrlib/genosl/mx_oren_nayar_diffuse_bsdf.osl" function="mx_oren_nayar_diffuse_bsdf" target="genosl" />
<implementation name="IM_oren_nayar_diffuse_bsdf_genosl" nodedef="ND_oren_nayar_diffuse_bsdf" file="mx_oren_nayar_diffuse_bsdf.osl" function="mx_oren_nayar_diffuse_bsdf" target="genosl" />

<!-- <burley_diffuse_bsdf> -->
<implementation name="IM_burley_diffuse_bsdf_genosl" nodedef="ND_burley_diffuse_bsdf" file="libraries/pbrlib/genosl/mx_burley_diffuse_bsdf.osl" function="mx_burley_diffuse_bsdf" target="genosl" />
<implementation name="IM_burley_diffuse_bsdf_genosl" nodedef="ND_burley_diffuse_bsdf" file="mx_burley_diffuse_bsdf.osl" function="mx_burley_diffuse_bsdf" target="genosl" />

<!-- <translucent_bsdf> -->
<implementation name="IM_translucent_bsdf_genosl" nodedef="ND_translucent_bsdf" file="libraries/pbrlib/genosl/mx_translucent_bsdf.osl" function="mx_translucent_bsdf" target="genosl" />
<implementation name="IM_translucent_bsdf_genosl" nodedef="ND_translucent_bsdf" file="mx_translucent_bsdf.osl" function="mx_translucent_bsdf" target="genosl" />

<!-- <dielectric_bsdf> -->
<implementation name="IM_dielectric_bsdf_genosl" nodedef="ND_dielectric_bsdf" file="libraries/pbrlib/genosl/mx_dielectric_bsdf.osl" function="mx_dielectric_bsdf" target="genosl" />
<implementation name="IM_dielectric_bsdf_genosl" nodedef="ND_dielectric_bsdf" file="mx_dielectric_bsdf.osl" function="mx_dielectric_bsdf" target="genosl" />

<!-- <conductor_bsdf> -->
<implementation name="IM_conductor_bsdf_genosl" nodedef="ND_conductor_bsdf" file="libraries/pbrlib/genosl/mx_conductor_bsdf.osl" function="mx_conductor_bsdf" target="genosl" />
<implementation name="IM_conductor_bsdf_genosl" nodedef="ND_conductor_bsdf" file="mx_conductor_bsdf.osl" function="mx_conductor_bsdf" target="genosl" />

<!-- <generalized_schlick_bsdf> -->
<implementation name="IM_generalized_schlick_bsdf_genosl" nodedef="ND_generalized_schlick_bsdf" file="libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl" function="mx_generalized_schlick_bsdf" target="genosl" />
<implementation name="IM_generalized_schlick_bsdf_genosl" nodedef="ND_generalized_schlick_bsdf" file="mx_generalized_schlick_bsdf.osl" function="mx_generalized_schlick_bsdf" target="genosl" />

<!-- <subsurface_bsdf> -->
<implementation name="IM_subsurface_bsdf_genosl" nodedef="ND_subsurface_bsdf" file="libraries/pbrlib/genosl/mx_subsurface_bsdf.osl" function="mx_subsurface_bsdf" target="genosl" />
<implementation name="IM_subsurface_bsdf_genosl" nodedef="ND_subsurface_bsdf" file="mx_subsurface_bsdf.osl" function="mx_subsurface_bsdf" target="genosl" />

<!-- <sheen_bsdf> -->
<implementation name="IM_sheen_bsdf_genosl" nodedef="ND_sheen_bsdf" file="libraries/pbrlib/genosl/mx_sheen_bsdf.osl" function="mx_sheen_bsdf" target="genosl" />
<implementation name="IM_sheen_bsdf_genosl" nodedef="ND_sheen_bsdf" file="mx_sheen_bsdf.osl" function="mx_sheen_bsdf" target="genosl" />

<!-- <anisotropic_vdf> -->
<implementation name="IM_anisotropic_vdf_genosl" nodedef="ND_anisotropic_vdf" file="libraries/pbrlib/genosl/mx_anisotropic_vdf.osl" function="mx_anisotropic_vdf" target="genosl" />
<implementation name="IM_anisotropic_vdf_genosl" nodedef="ND_anisotropic_vdf" file="mx_anisotropic_vdf.osl" function="mx_anisotropic_vdf" target="genosl" />

<!-- <thin_film_bsdf> -->
<implementation name="IM_thin_film_bsdf_genosl" nodedef="ND_thin_film_bsdf" target="genosl" />

<!-- <uniform_edf> -->
<implementation name="IM_uniform_edf_genosl" nodedef="ND_uniform_edf" file="libraries/pbrlib/genosl/mx_uniform_edf.inline" target="genosl" />
<implementation name="IM_uniform_edf_genosl" nodedef="ND_uniform_edf" file="mx_uniform_edf.inline" target="genosl" />

<!-- <layer> -->
<implementation name="IM_layer_bsdf_genosl" nodedef="ND_layer_bsdf" target="genosl" />
Expand All @@ -53,19 +53,19 @@
<implementation name="IM_multiply_edfF_genosl" nodedef="ND_multiply_edfF" target="genosl" />

<!-- <surface> -->
<implementation name="IM_surface_genosl" nodedef="ND_surface" file="libraries/pbrlib/genosl/mx_surface.osl" function="mx_surface" target="genosl" />
<implementation name="IM_surface_genosl" nodedef="ND_surface" file="mx_surface.osl" function="mx_surface" target="genosl" />

<!-- <displacement> -->
<implementation name="IM_displacement_float_genosl" nodedef="ND_displacement_float" file="libraries/pbrlib/genosl/mx_displacement_float.osl" function="mx_displacement_float" target="genosl" />
<implementation name="IM_displacement_vector3_genosl" nodedef="ND_displacement_vector3" file="libraries/pbrlib/genosl/mx_displacement_vector3.osl" function="mx_displacement_vector3" target="genosl" />
<implementation name="IM_displacement_float_genosl" nodedef="ND_displacement_float" file="mx_displacement_float.osl" function="mx_displacement_float" target="genosl" />
<implementation name="IM_displacement_vector3_genosl" nodedef="ND_displacement_vector3" file="mx_displacement_vector3.osl" function="mx_displacement_vector3" target="genosl" />

<!-- <roughness_anisotropy> -->
<implementation name="IM_roughness_anisotropy_genosl" nodedef="ND_roughness_anisotropy" file="libraries/pbrlib/genosl/mx_roughness_anisotropy.osl" function="mx_roughness_anisotropy" target="genosl" />
<implementation name="IM_roughness_anisotropy_genosl" nodedef="ND_roughness_anisotropy" file="mx_roughness_anisotropy.osl" function="mx_roughness_anisotropy" target="genosl" />

<!-- <roughness_dual> -->
<implementation name="IM_roughness_dual_genosl" nodedef="ND_roughness_dual" file="libraries/pbrlib/genosl/mx_roughness_dual.osl" function="mx_roughness_dual" target="genosl" />
<implementation name="IM_roughness_dual_genosl" nodedef="ND_roughness_dual" file="mx_roughness_dual.osl" function="mx_roughness_dual" target="genosl" />

<!-- <artistic_ior> -->
<implementation name="IM_artistic_ior_genosl" nodedef="ND_artistic_ior" file="libraries/pbrlib/genosl/mx_artistic_ior.osl" function="mx_artistic_ior" target="genosl" />
<implementation name="IM_artistic_ior_genosl" nodedef="ND_artistic_ior" file="mx_artistic_ior.osl" function="mx_artistic_ior" target="genosl" />

</materialx>
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_ap1_to_rec709_color3.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
#include "lib/mx_transform_color.glsl"

void mx_ap1_to_rec709_color3(vec3 _in, out vec3 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_ap1_to_rec709_color4.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl"
#include "lib/mx_transform_color.glsl"

void mx_ap1_to_rec709_color4(vec4 _in, out vec4 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_burn_color3.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/mx_burn_float.glsl"
#include "mx_burn_float.glsl"

void mx_burn_color3(vec3 fg, vec3 bg, float mixval, out vec3 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_burn_color4.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/mx_burn_float.glsl"
#include "mx_burn_float.glsl"

void mx_burn_color4(vec4 fg, vec4 bg, float mixval, out vec4 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_cellnoise2d_float.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_noise.glsl"
#include "lib/mx_noise.glsl"

void mx_cellnoise2d_float(vec2 texcoord, out float result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_cellnoise3d_float.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_noise.glsl"
#include "lib/mx_noise.glsl"

void mx_cellnoise3d_float(vec3 position, out float result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_dodge_color3.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/mx_dodge_float.glsl"
#include "mx_dodge_float.glsl"

void mx_dodge_color3(vec3 fg, vec3 bg, float mixval, out vec3 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_dodge_color4.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/mx_dodge_float.glsl"
#include "mx_dodge_float.glsl"

void mx_dodge_color4(vec4 fg , vec4 bg , float mixval, out vec4 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_noise.glsl"
#include "lib/mx_noise.glsl"

void mx_fractal3d_fa_vector2(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec2 result)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "libraries/stdlib/genglsl/lib/mx_noise.glsl"
#include "lib/mx_noise.glsl"

void mx_fractal3d_fa_vector3(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec3 result)
{
Expand Down
Loading