fix compile error

mob-sakai · Aug 10, 2024 · fa0abb6 · fa0abb6
1 parent 3755656
commit fa0abb6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Packages/src/Editor/ShaderPreProcessor.cs b/Packages/src/Editor/ShaderPreProcessor.cs
@@ -20,7 +20,8 @@ public override void OnProcessShader(Shader shader, ShaderSnippetData snippet,
             IList<ShaderCompilerData> data)
         {
             // If the shader is not SoftMask/SoftMaskable, do nothing.
-            if (shader.name != "Hidden/UI/SoftMask" && !shader.name.Contains("(SoftMaskable)")) return;
+            var name = shader.name;
+            if (name != "Hidden/UI/SoftMask" && !SoftMaskUtils.IsSoftMaskableShaderName(name)) return;
 
             // Remove the 'SOFTMASK_EDITOR' shader variants.
             var editor = new ShaderKeyword(shader, "SOFTMASK_EDITOR");

diff --git a/Packages/src/Runtime/Internal/Utilities/RenderTextureRepository.cs b/Packages/src/Runtime/Internal/Utilities/RenderTextureRepository.cs
@@ -149,8 +149,9 @@ int ParseToInt(string s, int start, int end)
             Profiler.EndSample();
 
             return new Vector2Int(w, h);
-#endif
+#else
             return new Vector2Int(Screen.width, Screen.height);
+#endif
         }
     }
 }
diff --git a/Packages/src/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs b/Packages/src/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs
@@ -194,7 +194,7 @@ internal static bool CanIncludeShader(Shader shader)
             if (!shader) return false;
 
             var name = shader.name;
-            return name.Contains("(SoftMaskable)")
+            return SoftMaskUtils.IsSoftMaskableShaderName(name)
                    || name == "Hidden/UI/SoftMask"
                    || name == "Hidden/UI/TerminalMaskingShape";
         }

diff --git a/Packages/src/Runtime/Utilities/SoftMaskUtils.cs b/Packages/src/Runtime/Utilities/SoftMaskUtils.cs
@@ -182,6 +182,15 @@ public static Material CreateSoftMaskable(
             return mat;
         }
 
+        public static bool IsSoftMaskableShaderName(string name)
+        {
+#if UNITY_2021_2_OR_NEWER
+            return name.Contains("(SoftMaskable)", StringComparison.Ordinal);
+#else
+            return name.Contains("(SoftMaskable)");
+#endif
+        }
+
         public static Shader GetSoftMaskableShader(Shader baseShader,
             UISoftMaskProjectSettings.FallbackBehavior fallback)
         {
@@ -202,7 +211,7 @@ public static Shader GetSoftMaskableShader(Shader baseShader,
             for (var i = 0; i < s_SoftMaskableShaderNameFormats.Length; i++)
             {
                 var name = string.Format(s_SoftMaskableShaderNameFormats[i], shaderName);
-                if (!name.Contains("(SoftMaskable)", StringComparison.Ordinal)) continue;
+                if (!IsSoftMaskableShaderName(name)) continue;
 
                 var shader = Shader.Find(name);
                 if (!shader) continue;