From 883f9e5049d60c7ab3f1b2ebd433b7fa2803a51b Mon Sep 17 00:00:00 2001 From: thagberg Date: Wed, 7 May 2025 16:31:22 -0400 Subject: [PATCH 1/3] Fix anti-aliasing on macOS Blitting to the resolve FBO in OSG::RenderStage was causing a GL_INVALID_FRAMEBUFFER_OPERATION due to a mismatch in attached colorbuffers between the FBOs bound in read and draw slots. This was because the normal attachment was invariantly attached to FBO_Interrupt, but not to other FBOs. --- apps/openmw/mwrender/postprocessor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwrender/postprocessor.cpp b/apps/openmw/mwrender/postprocessor.cpp index 4847da9cee..8b835a4d47 100644 --- a/apps/openmw/mwrender/postprocessor.cpp +++ b/apps/openmw/mwrender/postprocessor.cpp @@ -503,6 +503,7 @@ namespace MWRender if (mSamples > 1) { fbos[FBO_Multisample] = new osg::FrameBufferObject; + fbos[FBO_Intercept] = new osg::FrameBufferObject; auto colorRB = createFrameBufferAttachmentFromTemplate( Usage::RENDER_BUFFER, width, height, textures[Tex_Scene], mSamples); if (mNormals && mNormalsSupported) @@ -511,6 +512,8 @@ namespace MWRender Usage::RENDER_BUFFER, width, height, textures[Tex_Normal], mSamples); fbos[FBO_Multisample]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB); fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, normalRB); + fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, + Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal])); } auto depthRB = createFrameBufferAttachmentFromTemplate( Usage::RENDER_BUFFER, width, height, textures[Tex_Depth], mSamples); @@ -519,11 +522,8 @@ namespace MWRender osg::FrameBufferObject::BufferComponent::PACKED_DEPTH_STENCIL_BUFFER, depthRB); fbos[FBO_FirstPerson]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, colorRB); - fbos[FBO_Intercept] = new osg::FrameBufferObject; fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER0, Stereo::createMultiviewCompatibleAttachment(textures[Tex_Scene])); - fbos[FBO_Intercept]->setAttachment(osg::FrameBufferObject::BufferComponent::COLOR_BUFFER1, - Stereo::createMultiviewCompatibleAttachment(textures[Tex_Normal])); } else { From 4297ef2f97eaba58974e4d09f0157e27d7ca8a85 Mon Sep 17 00:00:00 2001 From: thagberg Date: Wed, 7 May 2025 21:55:58 -0400 Subject: [PATCH 2/3] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79671a0f86..7429aa2ddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -233,6 +233,7 @@ Bug #8441: Freeze when using video main menu replacers Bug #8445: Launcher crashes on exit when cell name loading thread is still running Bug #8462: Crashes when resizing the window on macOS + Bug #8465: Blue screen w/ antialiasing and post-processing on macOS Feature #1415: Infinite fall failsafe Feature #2566: Handle NAM9 records for manual cell references Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking From 2bcbb2d01c71c6eef99352f9bd95c1424b6e4433 Mon Sep 17 00:00:00 2001 From: thagberg Date: Wed, 7 May 2025 22:28:35 -0400 Subject: [PATCH 3/3] Update authors --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index e5caf5fa58..156d526917 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -232,6 +232,7 @@ Programmers Tess (tescoShoppah) thegriglat Thomas Luppi (Digmaster) + Tim Hagberg (hazardMan) tlmullis trav tri4ng1e