From 03752490a388968e539cc840a50d3f9cc89a6b3a Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Wed, 17 Jan 2024 10:46:22 -0800 Subject: [PATCH] Fix shader generation typos This changelist fixes a handful of minor typos in shader generation, introduced in #1355 and #1553. --- libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx | 6 +++--- libraries/stdlib/genosl/mx_creatematrix.osl | 6 +++--- libraries/stdlib/genosl/mx_normalmap.osl | 2 +- libraries/stdlib/genosl/stdlib_genosl_impl.mtlx | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx index c373a7392b..8526330d47 100644 --- a/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx +++ b/libraries/stdlib/genmsl/stdlib_genmsl_impl.mtlx @@ -729,9 +729,9 @@ - - - + + + diff --git a/libraries/stdlib/genosl/mx_creatematrix.osl b/libraries/stdlib/genosl/mx_creatematrix.osl index 933dce00ba..3e567d3b5b 100644 --- a/libraries/stdlib/genosl/mx_creatematrix.osl +++ b/libraries/stdlib/genosl/mx_creatematrix.osl @@ -1,4 +1,4 @@ -void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, out matrix result) +void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, output matrix result) { result = matrix(in1.x, in1.y, in1.z, 0.0, in2.x, in2.y, in2.z, 0.0, @@ -6,7 +6,7 @@ void mx_creatematrix_vector3_matrix33(vector in1, vector in2, vector in3, out ma 0.0, 0.0, 0.0, 1.0); } -void mx_creatematrix_vector3_matrix44(vector3 in1, vector3 in2, vector3 in3, vector3 in4, out matrix result) +void mx_creatematrix_vector3_matrix44(vector in1, vector in2, vector in3, vector in4, output matrix result) { result = matrix(in1.x, in1.y, in1.z, 0.0, in2.x, in2.y, in2.z, 0.0, @@ -14,7 +14,7 @@ void mx_creatematrix_vector3_matrix44(vector3 in1, vector3 in2, vector3 in3, vec in4.x, in4.y, in4.z, 1.0); } -void mx_creatematrix_vector4_matrix44(vector4 in1, vector4 in2, vector4 in3, vector4 in4, out matrix result) +void mx_creatematrix_vector4_matrix44(vector4 in1, vector4 in2, vector4 in3, vector4 in4, output matrix result) { result = matrix(in1.x, in1.y, in1.z, in1.w, in2.x, in2.y, in2.z, in2.w, diff --git a/libraries/stdlib/genosl/mx_normalmap.osl b/libraries/stdlib/genosl/mx_normalmap.osl index bf75781f51..79b31df69d 100644 --- a/libraries/stdlib/genosl/mx_normalmap.osl +++ b/libraries/stdlib/genosl/mx_normalmap.osl @@ -6,7 +6,7 @@ void mx_normalmap_vector2(vector value, string map_space, vector2 normal_scale, vector v = value * 2.0 - 1.0; vector T = normalize(U - dot(U, N) * N); vector B = normalize(cross(N, T)); - result = normalize(T * v[0] * normal_scale[0] + B * v[1] * normal_scale[1] + N * v[2]); + result = normalize(T * v[0] * normal_scale.x + B * v[1] * normal_scale.y + N * v[2]); } // Object space else diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx index bc63d946da..7268ee61dd 100644 --- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx +++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx @@ -732,9 +732,9 @@ - - - + + +