From a56b7042fcd8613bc1ce43e53ac00f9d81ff2ee6 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Mon, 24 Sep 2012 13:45:55 +0000 Subject: [PATCH] fixed a build issue in GraphicsDeviceWindowsMetro --- .../ANX.RenderSystem.GL3_WindowsMetro.csproj | 6 ------ .../Properties/AssemblyInfo.cs | 4 ++-- .../Properties/AssemblyInfo.cs | 4 ++-- .../GraphicsDeviceWindowsMetro.cs | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj index 73f6fc8d..bdaac18e 100644 --- a/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj +++ b/RenderSystems/ANX.Framework.GL3/ANX.RenderSystem.GL3_WindowsMetro.csproj @@ -71,12 +71,6 @@ - - - {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} - ANX.Framework - - diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs index 2acf054b..65f6040b 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/Properties/AssemblyInfo.cs @@ -32,7 +32,7 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.7.19.*")] -[assembly: AssemblyFileVersion("0.7.19.0")] +[assembly: AssemblyVersion("0.7.20.*")] +[assembly: AssemblyFileVersion("0.7.20.0")] [assembly: InternalsVisibleTo("ANX.Framework.ContentPipeline")] diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/Properties/AssemblyInfo.cs b/RenderSystems/ANX.RenderSystem.Windows.DX11/Properties/AssemblyInfo.cs index 1e4409b4..583e8405 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/Properties/AssemblyInfo.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Buildnummer // Revision // -[assembly: AssemblyVersion("0.7.11.*")] -[assembly: AssemblyFileVersion("0.7.11.0")] +[assembly: AssemblyVersion("0.7.12.*")] +[assembly: AssemblyFileVersion("0.7.12.0")] diff --git a/RenderSystems/ANX.RenderSystem.Windows.Metro/GraphicsDeviceWindowsMetro.cs b/RenderSystems/ANX.RenderSystem.Windows.Metro/GraphicsDeviceWindowsMetro.cs index fc830629..cf293c97 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.Metro/GraphicsDeviceWindowsMetro.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.Metro/GraphicsDeviceWindowsMetro.cs @@ -158,7 +158,7 @@ namespace ANX.RenderSystem.Windows.Metro #region DrawInstancedPrimitives public void DrawInstancedPrimitives(PrimitiveType primitiveType, int baseVertex, int minVertexIndex, int numVertices, int startIndex, - int primitiveCount, int instanceCount) + int primitiveCount, int instanceCount, IndexBuffer indexBuffer) { NativeDevice.NativeContext.DrawIndexedInstanced(numVertices, instanceCount, startIndex, baseVertex, 0);