From 9999ea8885a09e3932a19cb799333ed4b9cf0d1a Mon Sep 17 00:00:00 2001 From: Martin Date: Mon, 21 Oct 2024 12:10:56 +0200 Subject: [PATCH] Fix multisampled raw download --- .config/dotnet-tools.json | 2 +- RELEASE_NOTES.md | 2 ++ paket.dependencies | 2 +- paket.lock | 2 +- src/Aardvark.Service/RenderTasks.fs | 8 ++++---- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f3d2eb6c..b2ca8945 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -10,7 +10,7 @@ "rollForward": false }, "aardpack": { - "version": "1.0.24", + "version": "2.0.3", "commands": [ "aardpack" ], diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 0806c7b1..537d11aa 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,5 @@ +- Fixed multisampled raw download + ### 5.5.2 - updated Adaptify.Core to 1.3.0 (using local, new style adaptify) diff --git a/paket.dependencies b/paket.dependencies index bf703581..bf473de4 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,7 +3,7 @@ framework: auto-detect storage: none -nuget Aardvark.Build ~> 1.0.24 +nuget Aardvark.Build ~> 2.0.3 nuget FSharp.Core >= 8.0.0 lowest_matching: true nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true diff --git a/paket.lock b/paket.lock index a1242250..abf9821f 100644 --- a/paket.lock +++ b/paket.lock @@ -99,7 +99,7 @@ NUGET Aardvark.Base.TypeProviders (4.5.15) FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net8.0) (>= net45)) (&& (== net8.0-windows10.0.17763.0) (>= net45)) (&& (== netstandard2.0) (>= net45)) FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net8.0) (== net8.0-windows10.0.17763.0) (== netstandard2.0) - Aardvark.Build (1.0.25) + Aardvark.Build (2.0.3) Aardvark.FontProvider (0.1) Aardvark.Base.Fonts (>= 5.3) FSharp.Core (>= 8.0.100) diff --git a/src/Aardvark.Service/RenderTasks.fs b/src/Aardvark.Service/RenderTasks.fs index cf8f6f1d..dfd0dc4e 100644 --- a/src/Aardvark.Service/RenderTasks.fs +++ b/src/Aardvark.Service/RenderTasks.fs @@ -636,8 +636,8 @@ module Internals = GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, temp) GL.BlitFramebuffer( - 0, 0, size.X - 1, size.Y - 1, - 0, 0, size.X - 1, size.Y - 1, + 0, 0, size.X, size.Y, + 0, 0, size.X, size.Y, ClearBufferMask.ColorBufferBit, BlitFramebufferFilter.Nearest ) @@ -699,8 +699,8 @@ module Internals = GL.FramebufferRenderbuffer(FramebufferTarget.DrawFramebuffer, FramebufferAttachment.ColorAttachment0, RenderbufferTarget.Renderbuffer, rbo) GL.BlitFramebuffer( - 0, 0, size.X - 1, size.Y - 1, - 0, 0, size.X - 1, size.Y - 1, + 0, 0, size.X, size.Y, + 0, 0, size.X, size.Y, ClearBufferMask.ColorBufferBit, BlitFramebufferFilter.Nearest )