From 7ffe566f9b16ea3e77bdee38ab0cf000ac616082 Mon Sep 17 00:00:00 2001 From: Michel Fedde Date: Mon, 22 Mar 2021 13:21:12 +0100 Subject: [PATCH] Merge Fixed --- SMCode/SM.OGL/Framebuffer/Framebuffer.cs | 4 ++-- SM_TEST/TestRenderPipeline.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SMCode/SM.OGL/Framebuffer/Framebuffer.cs b/SMCode/SM.OGL/Framebuffer/Framebuffer.cs index 9ed8b77..e498b67 100644 --- a/SMCode/SM.OGL/Framebuffer/Framebuffer.cs +++ b/SMCode/SM.OGL/Framebuffer/Framebuffer.cs @@ -31,8 +31,8 @@ namespace SM.OGL.Framebuffer _windowScale = 1, }; - private readonly IFramebufferWindow _window; - private readonly float _windowScale; + private IFramebufferWindow _window; + private float _windowScale; /// public override ObjectLabelIdentifier TypeIdentifier { get; } = ObjectLabelIdentifier.Framebuffer; diff --git a/SM_TEST/TestRenderPipeline.cs b/SM_TEST/TestRenderPipeline.cs index e4b47d7..8ce9791 100644 --- a/SM_TEST/TestRenderPipeline.cs +++ b/SM_TEST/TestRenderPipeline.cs @@ -14,9 +14,9 @@ namespace SM_TEST public override void Initialization() { - MainFramebuffer = CreateWindowFramebuffer(0, true, PixelInformation.RGBA_HDR); + MainFramebuffer = CreateWindowFramebuffer(0); - _postBuffer = CreateWindowFramebuffer(0, false, PixelInformation.RGBA_HDR); + _postBuffer = CreateWindowFramebuffer(0); Framebuffers.Add(_postBuffer); _bloom = new BloomEffect(MainFramebuffer, hdr: true, .75f) {