unbug prev, and remove misleading code that no longer works

OpenRA.Game/Graphics/LineRenderer.cs

@@ -52,7 +52,7 @@ namespace OpenRA.Graphics
 					vertexBuffer.SetData( vertices );
 					indexBuffer.SetData( indices );
 					renderer.DrawBatch( vertexBuffer, indexBuffer,
-					nv, ni / 2, null, PrimitiveType.LineList );
+					nv, ni / 2, PrimitiveType.LineList );
 				} );
 
 				nv = 0; ni = 0;

OpenRA.Game/Graphics/Renderer.cs

@@ -110,12 +110,9 @@ namespace OpenRA.Graphics
 		}
 
 		public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
-			Range<int> vertexRange, Range<int> indexRange, ITexture texture, PrimitiveType type, IShader shader)
+			Range<int> vertexRange, Range<int> indexRange, PrimitiveType type, IShader shader)
 			where T : struct
 		{
-			shader.SetValue("DiffuseTexture", texture);
-			shader.Commit();
-
 			vertices.Bind();
 			indices.Bind();
 
@@ -125,12 +122,9 @@ namespace OpenRA.Graphics
 		}
 
 		public void DrawBatch<T>(IVertexBuffer<T> vertices, IIndexBuffer indices,
-			int vertexPool, int numPrimitives, ITexture texture, PrimitiveType type)
+			int vertexPool, int numPrimitives, PrimitiveType type)
 			where T : struct
 		{
-			SpriteShader.SetValue("DiffuseTexture", texture);
-			SpriteShader.Commit();
-
 			vertices.Bind();
 			indices.Bind();
 

OpenRA.Game/Graphics/SpriteRenderer.cs

@@ -61,7 +61,7 @@ namespace OpenRA.Graphics
 					renderer.DrawBatch(vertexBuffer, indexBuffer,
 						new Range<int>(0, nv),
 						new Range<int>(0, ni),
-						currentSheet.Texture, PrimitiveType.TriangleList,
+						PrimitiveType.TriangleList,
 						shader);
 				});
 

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -100,11 +100,12 @@ namespace OpenRA.Graphics
 
 			if( lastRow < firstRow ) lastRow = firstRow;
 
+			renderer.SpriteShader.SetValue( "DiffuseTexture", terrainSheet.Texture );
 			renderer.SpriteShader.Render(() =>
 				renderer.DrawBatch(vertexBuffer, indexBuffer,
 					new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow),
 					new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow),
-					terrainSheet.Texture, PrimitiveType.TriangleList, renderer.SpriteShader));
+					PrimitiveType.TriangleList, renderer.SpriteShader));
 
 			foreach (var r in Game.world.WorldActor.traits.WithInterface<IRenderOverlay>())
 				r.Render();