Resolve functions after inlining expressions

This fixes a bug introduced in c1d3a1d.

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index ccfbe691195eefd91aa4314281db6afc1bb97c97..e46e5401a8fbe452e8175cc622545d7f52caf6f7 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -312,7 +312,7 @@ Compiler::OptimizeResult Compiler::optimize(Stage &stage)
        }
        if(ExpressionInliner().apply(stage))
        {
-               resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+               resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
                any_inlined = true;
        }
 

diff --git a/tests/glsl/keep_used_function.glsl b/tests/glsl/keep_used_function.glsl
new file mode 100644 (file)
index 0000000..419f3f2
--- /dev/null
+++ b/tests/glsl/keep_used_function.glsl
@@ -0,0 +1,26 @@
+#pragma MSP stage(vertex)
+layout(location=0) in vec4 position;
+layout(location=1) in vec2 scale;
+float square(float arg)
+{
+       return arg*arg;
+}
+void main()
+{
+       float x_sq = square(scale.x);
+       float y_sq = square(scale.y);
+       gl_Position = position*sqrt(x_sq+y_sq);
+}
+
+/* Expected output: vertex
+layout(location=0) in vec4 position;
+layout(location=1) in vec2 scale;
+float square(float arg)
+{
+       return arg*arg;
+}
+void main()
+{
+       gl_Position = position*sqrt(square(scale.x)+square(scale.y));
+}
+*/