diff --git a/FeralTic b/FeralTic index 6d558069..ea69505d 160000 --- a/FeralTic +++ b/FeralTic @@ -1 +1 @@ -Subproject commit 6d558069e93c4dfca1a9fdff4adadb6f481a5817 +Subproject commit ea69505d981920ad86419fbe7f3361a67e468129 diff --git a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs index 2da02ed6..38fabfbf 100644 --- a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs +++ b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenForm.cs @@ -68,7 +68,7 @@ private void CreateSwapChain() this.form.Top = 0; this.form.Width = 1920; this.form.Height = 1080; - this.swapChain = new DX11SwapChain(this.RenderContext, this.form.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2); + this.swapChain = new DX11SwapChain(this.RenderContext, this.form.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2, false); this.RenderContext.Factory.SetWindowAssociation(this.form.Handle, SlimDX.DXGI.WindowAssociationFlags.IgnoreAll); } } diff --git a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs index 61e3d825..fc65f40b 100644 --- a/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs +++ b/Nodes/VVVV.DX11.Nodes.Experimental/DX11RenderFullScreenTest.cs @@ -58,7 +58,7 @@ private void CreateSwapChain() { if (this.swapChain == null && this.RenderContext != null) { - this.swapChain = new DX11SwapChain(this.RenderContext, this.node.Window.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2); + this.swapChain = new DX11SwapChain(this.RenderContext, this.node.Window.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SlimDX.DXGI.SampleDescription(1, 0), 60, 2, false); this.RenderContext.Factory.SetWindowAssociation(this.node.Window.Handle, SlimDX.DXGI.WindowAssociationFlags.IgnoreAll); } } diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs index 99cc8cba..1b852c30 100644 --- a/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs +++ b/Nodes/VVVV.DX11.Nodes/Nodes/Geometry/Primitives/DX11TetrahedronNode.cs @@ -32,7 +32,7 @@ protected override DX11IndexedGeometry GetGeom(DX11RenderContext context, int sl protected override bool Invalidate() { - return false;// this.FSize.IsChanged; + return this.FSize.IsChanged; } } } diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs index a38b81fc..3f415764 100644 --- a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs +++ b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/DX11PreviewNode.cs @@ -96,8 +96,7 @@ public void Render(DX11RenderContext context) if (!this.swapchain.Contains(context)) { - this.swapchain[context] = new DX11SwapChain(context, this.Handle, - SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SampleDescription(1, 0),60,1, false); + this.swapchain[context] = new DX11SwapChain(context, this.Handle, SlimDX.DXGI.Format.R8G8B8A8_UNorm, new SampleDescription(1, 0),60,1,false); } if (this.resized) diff --git a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs index 08715ecd..0632f746 100644 --- a/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs +++ b/Nodes/VVVV.DX11.Nodes/Nodes/Renderers/Graphics/DX11RendererNode.cs @@ -526,6 +526,8 @@ public void Update(DX11RenderContext context) this.FOutBackBuffer[0][context] = new DX11SwapChain(context, this.Handle, Format.R8G8B8A8_UNorm, sd, this.FInRefreshRate[0], this.FInBufferCount[0], this.FInFlipSequential[0]); + this.FInvalidateSwapChain = false; + #if DEBUG this.FOutBackBuffer[0][context].Resource.DebugName = "BackBuffer"; #endif diff --git a/appveyor.yml b/appveyor.yml index ade6ea09..058224e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,6 +3,7 @@ branches: # whitelist only: - master + - io image: Visual Studio 2015 @@ -11,11 +12,11 @@ platform: x64 configuration: Release build: - project: vvvv-dx11.sln + project: ci.targets artifacts: # pushing a single file - - path: vvvv-dx11-x64-build-alpha.zip + - path: Zip/vvvv-packs-dx11-x64.zip environment: priv_key: diff --git a/ci.targets b/ci.targets new file mode 100644 index 00000000..6a485119 --- /dev/null +++ b/ci.targets @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file