Remove incorrect definition of mix(float, float, float) from builtins

diff --git a/builtin_data/_builtin.glsl b/builtin_data/_builtin.glsl
index dcbb6d0abc7753c07cfc5cafbce39ce27b59e013..041bead2bc363c986ea6d5c89be5b0755c5c0437 100644 (file)
--- a/builtin_data/_builtin.glsl
+++ b/builtin_data/_builtin.glsl
@@ -256,7 +256,6 @@ float mix(float x, float y, float a);
 vec2 mix(vec2 x, vec2 y, vec2 a);
 vec3 mix(vec3 x, vec3 y, vec3 a);
 vec4 mix(vec4 x, vec4 y, vec4 a);
-float mix(float x, float y, float a) { return mix(x, y, float(a)); }
 vec2 mix(vec2 x, vec2 y, float a) { return mix(x, y, vec2(a)); }
 vec3 mix(vec3 x, vec3 y, float a) { return mix(x, y, vec3(a)); }
 vec4 mix(vec4 x, vec4 y, float a) { return mix(x, y, vec4(a)); }

diff --git a/scripts/builtin_funcs.py b/scripts/builtin_funcs.py
index 16c5721b0a3de9e77b23a67d664001bdedb9ef77..e8b4a4708a38864898779b4a638602194ce3b4b0 100755 (executable)
--- a/scripts/builtin_funcs.py
+++ b/scripts/builtin_funcs.py
@@ -115,7 +115,7 @@ shared_funcs = [
        ("T clamp(T x, T minVal, T maxVal)", arithmetictypes),
        ("T clamp(T x, T::Base minVal, T::Base maxVal)", "clamp(x, T(minVal), T(maxVal))", arithmeticvectypes),
        ("T mix(T x, T y, T a)", floattypes),
-       ("T mix(T x, T y, T::Base a)", "mix(x, y, T(a))", floattypes),
+       ("T mix(T x, T y, T::Base a)", "mix(x, y, T(a))", floatvectypes),
        ("T mix(T x, T y, bool[T::Dim] a)", arithmetictypes),
        ("T step(T edge, T x)", floattypes),
        ("T step(T::Base edge, T x)", "step(T(edge), x)", floatvectypes),