Parse and ignore const keyword in shader function parameters.

d4rkc0d3r · Apr 11, 2023 · 4ef99b8 · 4ef99b8
1 parent a73d3c0
commit 4ef99b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next Version
 ### Bug Fixes
 * Apparently `sampler` is also a way to declare a `SamplerState`. So now the optimizer also replaces those.
+* Parse and ignore const keyword in shader function parameters.
 
 ## v2.0.0
 ### Features

diff --git a/Editor/ShaderAnalyzer.cs b/Editor/ShaderAnalyzer.cs
@@ -1081,7 +1081,7 @@ private void AddParameterStructWrapper(List<string> funcParams, List<string> out
                     output.Add(line);
                     continue;
                 }
-                var match = Regex.Match(line, @"^((in|out|inout)\s)?\s*(\w+\s+\w+(\s*:\s*\w+)?)");
+                var match = Regex.Match(line, @"^((in|out|inout)\s+)?(?:const\s)?\s*(\w+\s+\w+(\s*:\s*\w+)?)");
                 if (match.Success)
                 {
                     if (isInput ^ match.Groups[2].Value != "out")
@@ -1108,7 +1108,7 @@ private void InitializeParameterFromWrapper(List<string> funcParams, List<string
                     output.Add(line);
                     continue;
                 }
-                var match = Regex.Match(line, @"^((in|out|inout)\s)?\s*(\w+)\s+(\w+)(\s*:\s*\w+)?");
+                var match = Regex.Match(line, @"^((in|out|inout)\s+)?(?:const\s)?\s*(\w+)\s+(\w+)(\s*:\s*\w+)?");
                 if (match.Success)
                 {
                     var type = match.Groups[3].Value;
@@ -1142,7 +1142,7 @@ private void AddOutParametersToFunctionDeclaration(List<string> funcParams, List
                     output.Add(line);
                     continue;
                 }
-                var match = Regex.Match(line, @"^((in|out|inout)\s)?\s*(\w+\s+\w+(\s*:\s*\w+))?");
+                var match = Regex.Match(line, @"^((in|out|inout)\s+)?(?:const\s)?\s*(\w+\s+\w+(\s*:\s*\w+))?");
                 if (match.Success)
                 {
                     if (match.Groups[2].Value == "out")
@@ -1164,7 +1164,7 @@ private void InitializeOutputParameter(List<string> funcParams, List<string> out
                     output.Add(line);
                     continue;
                 }
-                var match = Regex.Match(line, @"^((in|out|inout)\s)?\s*(\w+)\s+(\w+)(\s*:\s*\w+)?");
+                var match = Regex.Match(line, @"^((in|out|inout)\s+)?(?:const\s)?\s*(\w+)\s+(\w+)(\s*:\s*\w+)?");
                 if (match.Success)
                 {
                     if (match.Groups[2].Value == "out")

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "d4rkpl4y3r.d4rkavataroptimizer",
   "displayName": "d4rkAvatarOptimizer",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "unity": "2019.4",
   "description": "An optimizer aiming to reduce mesh & material count and more of VRChat 3.0 avatars.",
   "dependencies": {},