From 2629fa1c812518b37bfbd7ac2769b85d13c6f824 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Wed, 14 Dec 2011 13:02:49 +0000 Subject: [PATCH] RenderSystem DX11: it is rendering now --- .../ANX.RenderSystem.Windows.DX11/BlendState_DX11.cs | 1 + .../GraphicsDeviceWindowsDX11.cs | 2 +- Samples/RenderTarget/Program.cs | 6 ++++-- Samples/SimpleSprite/Program.cs | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/BlendState_DX11.cs b/RenderSystems/ANX.RenderSystem.Windows.DX11/BlendState_DX11.cs index 0ebad3bc..8086938d 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/BlendState_DX11.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/BlendState_DX11.cs @@ -76,6 +76,7 @@ namespace ANX.RenderSystem.Windows.DX11 for (int i = 0; i < blendStateDescription.RenderTarget.Length; i++) { blendStateDescription.RenderTarget[i] = new RenderTargetBlendDescription(); + blendStateDescription.RenderTarget[i].IsBlendEnabled = (i < 4); blendStateDescription.IndependentBlendEnable = true; } diff --git a/RenderSystems/ANX.RenderSystem.Windows.DX11/GraphicsDeviceWindowsDX11.cs b/RenderSystems/ANX.RenderSystem.Windows.DX11/GraphicsDeviceWindowsDX11.cs index e3a4cb1b..a2acf150 100644 --- a/RenderSystems/ANX.RenderSystem.Windows.DX11/GraphicsDeviceWindowsDX11.cs +++ b/RenderSystems/ANX.RenderSystem.Windows.DX11/GraphicsDeviceWindowsDX11.cs @@ -139,7 +139,7 @@ namespace ANX.RenderSystem.Windows.DX11 #else Device.CreateWithSwapChain(DriverType.Hardware, DeviceCreationFlags.None, desc, out dxDevice, out swapChain); #endif - this.deviceContext = new DeviceContext(dxDevice); + this.deviceContext = dxDevice.ImmediateContext; // Ignore all windows events Factory factory = swapChain.GetParent(); diff --git a/Samples/RenderTarget/Program.cs b/Samples/RenderTarget/Program.cs index be2e776b..dccb8ef1 100644 --- a/Samples/RenderTarget/Program.cs +++ b/Samples/RenderTarget/Program.cs @@ -10,8 +10,10 @@ namespace RenderTarget /// Der Haupteinstiegspunkt für die Anwendung. /// static void Main(string[] args) - { - //AddInSystemFactory.Instance.PreferredRenderSystem = "OpenGL3"; + { + //AddInSystemFactory.Instance.PreferredRenderSystem = "OpenGL3"; + //AddInSystemFactory.Instance.PreferredRenderSystem = "DirectX11"; + using (Game1 game = new Game1()) { game.Run(); diff --git a/Samples/SimpleSprite/Program.cs b/Samples/SimpleSprite/Program.cs index ce8e7d03..9a2b5764 100644 --- a/Samples/SimpleSprite/Program.cs +++ b/Samples/SimpleSprite/Program.cs @@ -12,7 +12,7 @@ namespace WindowsGame1 static void Main(string[] args) { //AddInSystemFactory.Instance.PreferredRenderSystem = "OpenGL3"; - AddInSystemFactory.Instance.PreferredRenderSystem = "DirectX11"; + //AddInSystemFactory.Instance.PreferredRenderSystem = "DirectX11"; using (Game1 game = new Game1()) {