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.

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

Updates for OSL shader generation #2153

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise2d_float.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise2d_float(vector2 texcoord, float jitter, output float result)
void mx_worleynoise2d_float(vector2 texcoord, float jitter, int style, output float result)
{
result = mx_worley_noise_float(texcoord, jitter, 0);
}
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise2d_vector2.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise2d_vector2(vector2 texcoord, float jitter, output vector2 result)
void mx_worleynoise2d_vector2(vector2 texcoord, float jitter, int style, output vector2 result)
{
result = mx_worley_noise_vector2(texcoord, jitter, 0);
}
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise2d_vector3.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise2d_vector3(vector2 texcoord, float jitter, output vector result)
void mx_worleynoise2d_vector3(vector2 texcoord, float jitter, int style, output vector result)
{
result = mx_worley_noise_vector3(texcoord, jitter, 0);
}
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise3d_float.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise3d_float(vector position, float jitter, output float result)
void mx_worleynoise3d_float(vector position, float jitter, int style, output float result)
{
result = mx_worley_noise_float(position, jitter, 0);
}
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise3d_vector2.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise3d_vector2(vector position, float jitter, output vector2 result)
void mx_worleynoise3d_vector2(vector position, float jitter, int style, output vector2 result)
{
result = mx_worley_noise_vector2(position, jitter, 0);
}
2 changes: 1 addition & 1 deletion libraries/stdlib/genosl/mx_worleynoise3d_vector3.osl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
void mx_worleynoise3d_vector3(vector position, float jitter, output vector result)
void mx_worleynoise3d_vector3(vector position, float jitter, int style, output vector result)
{
result = mx_worley_noise_vector3(position, jitter, 0);
}
3 changes: 2 additions & 1 deletion source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ TEST_CASE("GenReference: OSL Reference", "[genreference]")
// Generate reference shaders.
// Ignore the following nodes:
const mx::StringSet ignoreNodeList = { "surfacematerial", "volumematerial",
"constant_filename", "dot_filename"};
"constant_filename", "dot_filename",
"geompropvalueuniform_filename" };

bool failedGeneration = false;
for (const mx::NodeDefPtr& nodedef : stdlib->getNodeDefs())
Expand Down