From d8c0b9612118b356f0381ca28fc9652097d80a06 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Fri, 28 Sep 2012 06:42:02 +0000 Subject: [PATCH] - finished sample Primitives (codeplesx issue #531). Problem was a semantic issue in shader. For DX10 and DX11 you have to change POSITION0 o SV_POSITION. - removed a unnecessary Unmap call after initialing the VertexBffer in DX10 RenderSystem --- RenderSystems/ANX.RenderSystem.Windows.DX10/DxIndexBuffer.cs | 2 +- RenderSystems/ANX.RenderSystem.Windows.DX10/DxVertexBuffer.cs | 2 +- Samples/Primitives/Properties/AssemblyInfo.cs | 3 ++- Samples/SampleContent/Effects/HardwareInstancing.fx | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/DxIndexBuffer.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/DxIndexBuffer.cs index 1cb4b0ad..54d1e969 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/DxIndexBuffer.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/DxIndexBuffer.cs @@ -49,7 +49,7 @@ namespace ANX.RenderSystem.Windows.DX10 }; NativeBuffer = new Dx10.Buffer(device, description); - NativeBuffer.Unmap(); + //NativeBuffer.Unmap(); } #endregion diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX10/DxVertexBuffer.cs b/RenderSystems/ANX.RenderSystem.Windows.DX10/DxVertexBuffer.cs index aa5b1c38..67173860 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX10/DxVertexBuffer.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX10/DxVertexBuffer.cs @@ -62,7 +62,7 @@ namespace ANX.RenderSystem.Windows.DX11 }; NativeBuffer = new Dx.Buffer(device, description); - NativeBuffer.Unmap(); + //NativeBuffer.Unmap(); } } #endregion diff --git a/Samples/Primitives/Properties/AssemblyInfo.cs b/Samples/Primitives/Properties/AssemblyInfo.cs index a90b3e3d..bf1e7730 100644 --- a/Samples/Primitives/Properties/AssemblyInfo.cs +++ b/Samples/Primitives/Properties/AssemblyInfo.cs @@ -31,4 +31,5 @@ using System.Runtime.InteropServices; // Build-Nummer // Revision // -[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.*")] +[assembly: AssemblyFileVersionAttribute("1.0.1.0")] diff --git a/Samples/SampleContent/Effects/HardwareInstancing.fx b/Samples/SampleContent/Effects/HardwareInstancing.fx index 0ac6f2f8..59a07f83 100644 --- a/Samples/SampleContent/Effects/HardwareInstancing.fx +++ b/Samples/SampleContent/Effects/HardwareInstancing.fx @@ -14,7 +14,7 @@ struct VertexShaderInput struct VertexShaderOutput { - float4 Position : POSITION0; + float4 Position : SV_POSITION; float4 Color : COLOR0; };