[Rendering] Add Material Apply Mode;

[Rendering] Optimize SkinnedMesh/Mesh rendering;

Author: LittleCodingFox

Engine/Core/Rendering/Animation/SkinnedMeshRenderSystem.cs

@@ -280,39 +280,27 @@ public void Submit()
                 var material = renderer.materials[j];
 
                 var needsChange = assetGuid != lastMeshAsset ||
-                    material.Guid != (lastMaterial?.Guid ?? "") ||
-                    lastAnimator != animator;
+                    material.Guid != (lastMaterial?.Guid ?? "");
 
-                if(needsChange)
+                var lightSystem = RenderSystem.Instance.Get<LightSystem>();
+
+                if (needsChange)
                 {
                     lastMeshAsset = assetGuid;
                     lastMaterial = material;
-                    lastAnimator = animator;
 
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
 
                     material.EnableShaderKeyword(Shader.SkinningKeyword);
 
-                    var lightSystem = RenderSystem.Instance.Get<LightSystem>();
-
                     lightSystem?.ApplyMaterialLighting(material, pair.renderer.lighting);
 
                     if(material.ShaderProgram.Valid == false)
                     {
                         continue;
                     }
 
-                    bgfx.set_state((ulong)(state |
-                        renderer.mesh.PrimitiveFlag() |
-                        material.shader.BlendingFlag |
-                        material.CullingFlag), 0);
-
-                    material.ApplyProperties();
-
-                    material.shader.SetMatrix4x4(material.GetShaderHandle("u_boneMatrices"), boneMatrices);
-
-                    lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
-                        RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
+                    material.ApplyProperties(Material.ApplyMode.TexturesOnly);
                 }
 
                 unsafe
@@ -324,11 +312,24 @@ public void Submit()
 
                 renderer.mesh.SetActive(j);
 
+                material.ApplyProperties(Material.ApplyMode.IgnoreTextures);
+
+                material.shader.SetMatrix4x4(material.GetShaderHandle("u_boneMatrices"), boneMatrices);
+
                 var program = material.ShaderProgram;
 
+                bgfx.set_state((ulong)(state |
+                    renderer.mesh.PrimitiveFlag() |
+                    material.shader.BlendingFlag |
+                    material.CullingFlag), 0);
+
+                lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
+                    RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
+
                 var flags = bgfx.DiscardFlags.VertexStreams |
                     bgfx.DiscardFlags.IndexBuffer |
-                    bgfx.DiscardFlags.Transform;
+                    bgfx.DiscardFlags.Transform |
+                    bgfx.DiscardFlags.State;
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }

Engine/Core/Rendering/Graphics.cs

@@ -67,7 +67,7 @@ public static void RenderGeometry(VertexBuffer vertex, IndexBuffer index,
             }
             else
             {
-                material.ApplyProperties();
+                material.ApplyProperties(Material.ApplyMode.All);
 
                 material.DisableShaderKeyword(Shader.SkinningKeyword);
             }
@@ -133,7 +133,7 @@ public static void RenderSimple<T>(Span<T> vertices, VertexLayout layout, ushort
             }
             else
             {
-                material.ApplyProperties();
+                material.ApplyProperties(Material.ApplyMode.All);
 
                 material.DisableShaderKeyword(Shader.SkinningKeyword);
             }

Engine/Core/Rendering/Material.cs

@@ -61,6 +61,13 @@ public override string ToString()
         }
     }
 
+    internal enum ApplyMode
+    {
+        IgnoreTextures,
+        TexturesOnly,
+        All,
+    }
+
     internal const string MainColorProperty = "mainColor";
     internal const string MainTextureProperty = "mainTexture";
 
@@ -618,7 +625,8 @@ internal ShaderHandle GetShaderHandle(string name)
     /// <summary>
     /// Applies the default properties of this material to the shader
     /// </summary>
-    internal void ApplyProperties()
+    /// <param name="applyMode">How to apply the properties</param>
+    internal void ApplyProperties(ApplyMode applyMode)
     {
         if(shader == null)
         {
@@ -650,12 +658,23 @@ internal void ApplyProperties()
 
             foreach (var parameter in parameters.Values)
             {
+                if((applyMode == ApplyMode.IgnoreTextures && parameter.type == MaterialParameterType.Texture) ||
+                    (applyMode == ApplyMode.TexturesOnly && parameter.type != MaterialParameterType.Texture))
+                {
+                    continue;
+                }
+
                 var key = parameter.name;
 
                 switch (parameter.type)
                 {
                     case MaterialParameterType.Texture:
 
+                        if(applyMode == ApplyMode.IgnoreTextures)
+                        {
+                            continue;
+                        }
+
                         applyPropertiesCallbacks[counter++] = () =>
                         {
                             if (parameter.hasTexture == false)

Engine/Core/Rendering/Mesh/MeshRenderSystem.cs

@@ -86,7 +86,7 @@ public static void RenderMesh(Mesh mesh, Vector3 position, Quaternion rotation,
 
         bgfx.set_state((ulong)state, 0);
 
-        material.ApplyProperties();
+        material.ApplyProperties(Material.ApplyMode.All);
 
         mesh.SetActive();
 
@@ -226,32 +226,24 @@ void DrawMesh(int index)
 
                 var needsChange = lastMaterial?.Guid.GetHashCode() != material?.Guid?.GetHashCode();
 
-                if(needsChange)
+                var lightSystem = RenderSystem.Instance.Get<LightSystem>();
+
+                if (needsChange)
                 {
                     bgfx.discard((byte)bgfx.DiscardFlags.All);
 
                     lastMaterial = material;
 
                     material.DisableShaderKeyword(Shader.SkinningKeyword);
 
-                    var lightSystem = RenderSystem.Instance.Get<LightSystem>();
-
                     lightSystem?.ApplyMaterialLighting(material, pair.renderer.lighting);
 
                     if(material.ShaderProgram.Valid == false)
                     {
                         return;
                     }
 
-                    bgfx.set_state((ulong)(state |
-                        pair.renderer.mesh.PrimitiveFlag() |
-                        material.shader.BlendingFlag |
-                        material.CullingFlag), 0);
-
-                    material.ApplyProperties();
-
-                    lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
-                        RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
+                    material.ApplyProperties(Material.ApplyMode.TexturesOnly);
                 }
 
                 unsafe
@@ -263,11 +255,22 @@ void DrawMesh(int index)
 
                 pair.renderer.mesh.SetActive(index);
 
+                bgfx.set_state((ulong)(state |
+                    pair.renderer.mesh.PrimitiveFlag() |
+                    material.shader.BlendingFlag |
+                    material.CullingFlag), 0);
+
+                material.ApplyProperties(Material.ApplyMode.IgnoreTextures);
+
+                lightSystem?.ApplyLightProperties(pair.position, pair.transform, material,
+                    RenderSystem.CurrentCamera.Item2.Position, pair.renderer.lighting);
+
                 var program = material.ShaderProgram;
 
                 var flags = bgfx.DiscardFlags.VertexStreams |
                     bgfx.DiscardFlags.IndexBuffer |
-                    bgfx.DiscardFlags.Transform;
+                    bgfx.DiscardFlags.Transform |
+                    bgfx.DiscardFlags.State;
 
                 bgfx.submit(pair.viewID, program, 0, (byte)flags);
             }