Feature: Pre-calculate the results of a float and vector.

Extended support.  Now includes 'vec * a * b'.

Author: DeanEdisGG

ShaderShrinker/Shrinker.Parser/Optimizations/PerformArithmeticExtension.cs

@@ -191,8 +191,10 @@ public static bool PerformArithmetic(this SyntaxNode rootNode)
                             var numberNode = symbolNode.Next;
                             if (numberNode?.Token is FloatToken)
                             {
-                                // Number must not be used in a following math operation.
-                                if (numberNode.Next?.Token is not SymbolOperatorToken nextMath || nextMath.GetMathSymbolType() != TokenExtensions.MathSymbolType.MultiplyDivide)
+                                // Number must not be used in a following math operation of a different category.
+                                if (numberNode.Next?.Token is not SymbolOperatorToken nextMath ||
+                                    nextMath.GetMathSymbolType() == symbol.GetMathSymbolType() ||
+                                    nextMath.GetMathSymbolType() == TokenExtensions.MathSymbolType.AddSubtract)
                                 {
                                     // Perform math on each bracketed value.
                                     var newCsv =

ShaderShrinker/UnitTests/VectorArithmeticTests.cs

@@ -237,7 +237,8 @@ public void CheckArithmeticWithVectorAndScalar(
                     "vec2 main() { return 2. / vec2(1, 2); }",
                     "vec2 main() { return 1. + 3. * vec2(1, 2); }",
                     "vec2 main() { return 1. + vec2(1, 2) * 3.; }",
-                    "vec2 main() { return vec2(21, 22) / 7.; }")] string code,
+                    "vec2 main() { return vec2(21, 22) / 7.; }",
+                    "vec3 main() { vec3 v = vec3(.4); float k = 1.; return (v + vec3(.6, .8, 1) * .5 * k) / (1. + k); }")] string code,
             [Values("vec2 f = vec2(4.4, 5.5);",
                     "vec3 f = vec3(-3.3, -2.2, -1.1);",
                     "vec4 f = vec4(2.42);",
@@ -256,7 +257,8 @@ public void CheckArithmeticWithVectorAndScalar(
                     "vec2 main() { return vec2(2, 1); }",
                     "vec2 main() { return vec2(4, 7); }",
                     "vec2 main() { return vec2(4, 7); }",
-                    "vec2 main() { return vec2(21, 22) / 7.; }")] string expected)
+                    "vec2 main() { return vec2(21, 22) / 7.; }",
+                    "vec3 main() { vec3 v = vec3(.4); float k = 1.; return (v + vec3(.3, .4, .5) * k) / (1. + k); }")] string expected)
         {
             var lexer = new Lexer();
             lexer.Load(code);