Extract vertex attributes

OpenRA.Game/Graphics/ModelRenderer.cs

@@ -277,7 +277,7 @@ namespace OpenRA.Graphics
 			shader.SetVec("DiffuseLight", diffuseLight, 3);
 
 			shader.PrepareRender();
-			renderer.DrawBatch(cache.VertexBuffer, renderData.Start, renderData.Count, PrimitiveType.TriangleList);
+			renderer.DrawBatch(cache.VertexBuffer, shader, renderData.Start, renderData.Count, PrimitiveType.TriangleList);
 		}
 
 		public void BeginFrame()

OpenRA.Game/Graphics/PlatformInterfaces.cs

@@ -10,6 +10,7 @@
 #endregion
 
 using System;
+using OpenRA.Graphics;
 using OpenRA.Primitives;
 
 namespace OpenRA
@@ -88,7 +89,7 @@ namespace OpenRA
 		ITexture CreateTexture();
 		IFrameBuffer CreateFrameBuffer(Size s);
 		IFrameBuffer CreateFrameBuffer(Size s, Color clearColor);
-		IShader CreateShader(string name);
+		IShader CreateShader(IShaderBindings shaderBindings);
 		void EnableScissor(int x, int y, int width, int height);
 		void DisableScissor();
 		void Present();
@@ -130,6 +131,17 @@ namespace OpenRA
 		void SetTexture(string param, ITexture texture);
 		void SetMatrix(string param, float[] mtx);
 		void PrepareRender();
+		void Bind();
+	}
+
+	public interface IShaderBindings
+	{
+		string VertexShaderName { get; }
+		string VertexShaderCode { get; }
+		string FragmentShaderName { get; }
+		string FragmentShaderCode { get; }
+		int Stride { get; }
+		ShaderVertexAttribute[] Attributes { get; }
 	}
 
 	public enum TextureScaleFilter { Nearest, Linear }

OpenRA.Game/Graphics/ShaderBindings.cs

@@ -0,0 +1,56 @@
+#region Copyright & License Information
+/*
+ * Copyright (c) The OpenRA Developers and Contributors
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.Graphics
+{
+	public readonly struct ShaderVertexAttribute
+	{
+		public readonly string Name;
+		public readonly int Components;
+		public readonly int Offset;
+
+		public ShaderVertexAttribute(string name, int components, int offset)
+		{
+			Name = name;
+			Components = components;
+			Offset = offset;
+		}
+	}
+
+	public abstract class ShaderBindings : IShaderBindings
+	{
+		public string VertexShaderName { get; }
+		public string VertexShaderCode { get; }
+		public string FragmentShaderName { get; }
+		public string FragmentShaderCode { get; }
+		public int Stride { get; }
+
+		public abstract ShaderVertexAttribute[] Attributes { get; }
+
+		protected ShaderBindings(string name)
+		{
+			Stride = Attributes.Sum(a => a.Components * 4);
+			VertexShaderName = name;
+			VertexShaderCode = GetShaderCode(VertexShaderName + ".vert");
+			FragmentShaderName = name;
+			FragmentShaderCode = GetShaderCode(FragmentShaderName + ".frag");
+		}
+
+		public static string GetShaderCode(string filename)
+		{
+			var filepath = Path.Combine(Platform.EngineDir, "glsl", filename);
+			return File.ReadAllText(filepath);
+		}
+	}
+}

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Graphics
 				renderer.Context.SetBlendMode(currentBlend);
 				shader.PrepareRender();
 
-				renderer.DrawQuadBatch(ref vertices, vertexCount);
+				renderer.DrawQuadBatch(ref vertices, shader, vertexCount);
 				renderer.Context.SetBlendMode(BlendMode.None);
 
 				vertexCount = 0;
@@ -186,7 +186,7 @@ namespace OpenRA.Graphics
 
 			renderer.Context.SetBlendMode(blendMode);
 			shader.PrepareRender();
-			renderer.DrawQuadBatch(buffer, indices, length, UintSize * start);
+			renderer.DrawQuadBatch(buffer, indices, shader, length, UintSize * start);
 			renderer.Context.SetBlendMode(BlendMode.None);
 		}
 

OpenRA.Game/Graphics/Vertex.cs

@@ -46,4 +46,34 @@ namespace OpenRA.Graphics
 			R = r; G = g; B = b; A = a;
 		}
 	}
+
+	public sealed class CombinedShaderBindings : ShaderBindings
+	{
+		public CombinedShaderBindings()
+			: base("combined")
+		{ }
+
+		public override ShaderVertexAttribute[] Attributes { get; }	= new[]
+		{
+			new ShaderVertexAttribute("aVertexPosition", 3, 0),
+			new ShaderVertexAttribute("aVertexTexCoord", 4, 12),
+			new ShaderVertexAttribute("aVertexTexMetadata", 2, 28),
+			new ShaderVertexAttribute("aVertexTint", 4, 36)
+		};
+	}
+
+	public sealed class ModelShaderBindings : ShaderBindings
+	{
+		public ModelShaderBindings()
+			: base("model")
+		{ }
+
+		public override ShaderVertexAttribute[] Attributes { get; }	= new[]
+		{
+			new ShaderVertexAttribute("aVertexPosition", 3, 0),
+			new ShaderVertexAttribute("aVertexTexCoord", 4, 12),
+			new ShaderVertexAttribute("aVertexTexMetadata", 2, 28),
+			new ShaderVertexAttribute("aVertexTint", 4, 36)
+		};
+	}
 }