Implement MSAA for 2D #63003

Geometror · 2022-07-14T16:40:29Z

This PR implements MSAA for the 2D/Canvas renderer. (Implements godotengine/godot-proposals#1297) In addition, this might improve the situation for godotengine/godot-proposals#1126.

Detailed changes:

Implement 2D MSAA support for the Canvas renderer, which can be controlled separately from 3D MSAA for maximum flexibility (2X, 4X and 8X are supported, same as for 3D)
- implementation should be efficient since we can use automatic resolving without the need of VkCmdResolveImage, which has a negative impact on bandwidth
- can be set for each viewport separately
- currently not implemented for OpenGL implementation (but should be easy once the OpenGL renderer is done)
Rename project settings, viewport properties and methods from msaa to msaa_2/3d for clarity
Minor code restructuring and comment style fixes

Without MSAA:

MSAA 2x:

MSAA 4x:

MSAA 8x:

Bugsquad edit: This partially addresses godotengine/godot-proposals#4354. This closes #56233 by adding MSAA sample checks to both 2D and 3D.

drivers/gles3/storage/texture_storage.cpp

editor/editor_node.cpp

editor/plugins/material_editor_plugin.cpp

servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp

servers/rendering/renderer_rd/storage_rd/texture_storage.cpp

drivers/gles3/storage/texture_storage.cpp

Geometror · 2022-07-16T16:24:17Z

NOTE: No longer included!
Cleaned it up and added the implementation for the OpenGL renderer:

Geometror · 2022-07-25T12:43:03Z

Rebased and added checks for the maximum supported sample count for both 2D and 3D MSAA. This should fix any crashes on Mali when MSAA is above 4x.

clayjohn

Great work! I am very excited about this PR and I know many users will be too.

I have left a few comments on implementation, mostly just stuff that needs to be fixed up in the GLES3 implementation.

doc/classes/ProjectSettings.xml

doc/classes/Viewport.xml

clayjohn · 2022-07-26T04:18:40Z

drivers/gles3/storage/texture_storage.cpp


-		glTexImage2D(GL_TEXTURE_2D, 0, rt->color_internal_format, rt->size.x, rt->size.y, 0, rt->color_format, rt->color_type, nullptr);
+		if (rt->msaa != RS::VIEWPORT_MSAA_DISABLED) {
+#ifndef JAVASCRIPT_ENABLED


WebGL2 uses Renderbuffers to support Multisampled Framebuffers. So you can still use it even though GL_TEXTURE_2D_MULTISAMPLE isn't defined

clayjohn · 2022-07-26T04:23:21Z

drivers/gles3/rasterizer_canvas_gles3.cpp

@@ -247,6 +247,8 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 				Rect2i group_rect = ci->canvas_group_owner->global_rect_cache;

 				if (ci->canvas_group_owner->canvas_group->mode == RS::CANVAS_GROUP_MODE_OPAQUE) {
+					// Resolve the multisampled framebuffer before copying to the back buffer.
+					_resolve_multisampled_fbo(p_to_render_target);


We need to minimize the number of FBO changes and full screen copies we do in order to keep performance manageable on mobile devices. Accordingly, I would put the resolve inside of render_target_copy_to_back_buffer(). If copying the full rect, you can get away with resolving the Multisampled buffer directly into the backbuffer. If copying a partial rect, you'll have to resolve and then copy still.

clayjohn · 2022-07-26T04:44:34Z

drivers/gles3/storage/texture_storage.cpp


-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+			glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, texture_samples[rt->msaa], rt->color_internal_format, rt->size.x, rt->size.y, GL_TRUE);


Right now this will break 3D rendering as the same color texture is used in both 2D and 3D. Since the Depth texture does not use Multisample the Framebuffer will fail on creation.

drivers/gles3/storage/texture_storage.cpp

servers/rendering/renderer_rd/storage_rd/texture_storage.cpp

doc/classes/ProjectSettings.xml

Geometror

Currently combined 2D and 3D rendering is broken since the resolve attachment's store op is VK_ATTACHMENT_STORE_OP_DONT_CARE while it should be VK_ATTACHMENT_STORE_OP_STORE. (this took way too long to figure out :))

Just brute forcing all store ops to VK_ATTACHMENT_STORE_OP_STORE resolves the issue:

Now that I know what's wrong I can work on a proper fix, will probably push one tomorrow after I addressed clayjohns review comments. (I also rewrote a few bits to make things cleaner)

Geometror · 2022-07-29T00:30:47Z

The Vulkan side is should be done now, OpenGL still needs some work, but because of #63600 I can't test my changes - so that might take some time. If it's ok, I would prefer to only have the critical parts in the OpenGL implementation fixed and then implement 2D MSAA properly later (e.g. with webgl2 support) when the OpenGL renderer has matured. This PR was already pretty time-consuming and unfortunately I have not much time currently.

Geometror · 2022-08-01T19:04:24Z

Rebased. Regarding the GLES3 part: I just looked at the code and noticed that 3D MSAA is also not yet implemented. I would rather strip the implementation completely from this PR and add both 2D and 3D MSAA together at a later point in time (and properly, so that you can set both independently from each other like in the Vulkan renderer).

clayjohn · 2022-08-01T20:52:45Z

Rebased. Regarding the GLES3 part: I just looked at the code and noticed that 3D MSAA is also not yet implemented. I would rather strip the implementation completely from this PR and add both 2D and 3D MSAA together at a later point in time (and properly, so that you can set both independently from each other like in the Vulkan renderer).

Fair enough. I am okay with that if you are planning on adding it back at a later time to avoid this getting too complex.

Geometror · 2022-08-01T21:44:34Z

Ok, I removed the GLES3 implementation (a warning is printed when the user tries to enable it). With that I think this PR is complete :)

clayjohn

Just the one change before it is ready to go

drivers/vulkan/rendering_device_vulkan.cpp

clayjohn

I'm happy with this PR. Should be ready to merge.

CC @BastiaanOlij I think this may conflict with your Framebuffer reorganization PR, but I think we should merge it now as Geometror won't be available for awhile after the end of this week.

reduz · 2022-08-16T11:18:40Z

Does this work properly with backbuffer or clip effects? I think it would be good to test this before merging.

Geometror · 2022-08-17T10:19:59Z

@reduz Yes, this seems to work fine with those effects(MSAA 8x):

Polygon2D with clip children enabled

Backbuffer-reading post processing shader

akien-mga · 2022-08-30T12:54:16Z

@reduz says it's OK so let's merge 👍

akien-mga · 2022-08-30T12:54:24Z

Thanks!

insomniacUNDERSCORElemon · 2022-09-17T08:45:04Z

Small note: this doesn't smooth the clipped items themselves, only the parent. Note the zoomed square (that part lacking AA is a polygon):

(also seen w/this screenshot is the backbuffer ghosting which is not specific to MSAA, also unwanted color blending)

Geometror · 2022-09-17T18:56:39Z

@insomniacUNDERSCORElemon Could you open an issue and provide an reproduction project? :)

Calinou · 2022-09-17T20:53:21Z

@insomniacUNDERSCORElemon Could you open an issue and provide an reproduction project? :)

An issue was opened: #66005

Geometror added enhancement topic:rendering breaks compat topic:2d topic:3d labels Jul 14, 2022

Geometror added this to the 4.0 milestone Jul 14, 2022

Geometror requested review from a team as code owners July 14, 2022 16:40

Geometror force-pushed the msaa-2d branch from 38fd395 to 8089b23 Compare July 14, 2022 23:05

Geometror requested a review from a team as a code owner July 14, 2022 23:05

MarianoGnu reviewed Jul 16, 2022

View reviewed changes

drivers/gles3/storage/texture_storage.cpp Outdated Show resolved Hide resolved

MarianoGnu reviewed Jul 16, 2022

View reviewed changes

Geometror force-pushed the msaa-2d branch from 8089b23 to aa939fc Compare July 16, 2022 16:21

Geometror force-pushed the msaa-2d branch 2 times, most recently from 4e9feee to ce1f1bb Compare July 16, 2022 17:31

Geometror force-pushed the msaa-2d branch from ce1f1bb to d734974 Compare July 25, 2022 12:22

clayjohn requested changes Jul 26, 2022

View reviewed changes

Geometror commented Jul 28, 2022

View reviewed changes

Geometror force-pushed the msaa-2d branch 2 times, most recently from de56470 to b945698 Compare July 28, 2022 23:55

Geometror force-pushed the msaa-2d branch from b945698 to e87dcbe Compare August 1, 2022 18:51

Geometror force-pushed the msaa-2d branch from e87dcbe to dbebb11 Compare August 1, 2022 21:31

Geometror requested a review from clayjohn August 4, 2022 19:44

Calinou mentioned this pull request Aug 7, 2022

Antialiasing doesn't work in 2D #64000

Closed

clayjohn requested changes Aug 8, 2022

View reviewed changes

drivers/vulkan/rendering_device_vulkan.cpp Outdated Show resolved Hide resolved

Geometror force-pushed the msaa-2d branch 4 times, most recently from 65ef7c7 to 6039b23 Compare August 10, 2022 01:44

clayjohn approved these changes Aug 11, 2022

View reviewed changes

Implement MSAA for 2D [Vulkan only]

e96b1a2

Geometror force-pushed the msaa-2d branch from 6039b23 to e96b1a2 Compare August 12, 2022 23:11

clayjohn requested a review from reduz August 18, 2022 22:26

akien-mga merged commit 02d510b into godotengine:master Aug 30, 2022

akien-mga mentioned this pull request Aug 30, 2022

Add "universal" anti-aliasing in 2D (MSAA and/or SSAA) godotengine/godot-proposals#1297

Closed

qarmin mentioned this pull request Sep 7, 2022

Very random crashes when executing SubViewport.set_size_2d_override_stretch #65456

Closed

Calinou mentioned this pull request Dec 1, 2022

OpenGL: 2D MSAA antialiasing is not reimplemented yet (3D available since 4.3.dev1) #69462

Open

Calinou mentioned this pull request Feb 24, 2023

Update the add-on for Godot 4 godot-extended-libraries/godot-antialiased-line2d#5

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement MSAA for 2D #63003

Implement MSAA for 2D #63003

Geometror commented Jul 14, 2022 •

edited

Loading

Geometror commented Jul 16, 2022 •

edited

Loading

Geometror commented Jul 25, 2022

clayjohn left a comment

clayjohn Jul 26, 2022

clayjohn Jul 26, 2022

clayjohn Jul 26, 2022

Geometror left a comment •

edited

Loading

Geometror commented Jul 29, 2022

Geometror commented Aug 1, 2022

clayjohn commented Aug 1, 2022

Geometror commented Aug 1, 2022

clayjohn left a comment

clayjohn left a comment

reduz commented Aug 16, 2022

Geometror commented Aug 17, 2022 •

edited

Loading

akien-mga commented Aug 30, 2022

akien-mga commented Aug 30, 2022

insomniacUNDERSCORElemon commented Sep 17, 2022 •

edited

Loading

Geometror commented Sep 17, 2022

Calinou commented Sep 17, 2022 •

edited

Loading

Implement MSAA for 2D #63003

Implement MSAA for 2D #63003

Conversation

Geometror commented Jul 14, 2022 • edited Loading

Geometror commented Jul 16, 2022 • edited Loading

Geometror commented Jul 25, 2022

clayjohn left a comment

Choose a reason for hiding this comment

clayjohn Jul 26, 2022

Choose a reason for hiding this comment

clayjohn Jul 26, 2022

Choose a reason for hiding this comment

clayjohn Jul 26, 2022

Choose a reason for hiding this comment

Geometror left a comment • edited Loading

Choose a reason for hiding this comment

Geometror commented Jul 29, 2022

Geometror commented Aug 1, 2022

clayjohn commented Aug 1, 2022

Geometror commented Aug 1, 2022

clayjohn left a comment

Choose a reason for hiding this comment

clayjohn left a comment

Choose a reason for hiding this comment

reduz commented Aug 16, 2022

Geometror commented Aug 17, 2022 • edited Loading

akien-mga commented Aug 30, 2022

akien-mga commented Aug 30, 2022

insomniacUNDERSCORElemon commented Sep 17, 2022 • edited Loading

Geometror commented Sep 17, 2022

Calinou commented Sep 17, 2022 • edited Loading

Geometror commented Jul 14, 2022 •

edited

Loading

Geometror commented Jul 16, 2022 •

edited

Loading

Geometror left a comment •

edited

Loading

Geometror commented Aug 17, 2022 •

edited

Loading

insomniacUNDERSCORElemon commented Sep 17, 2022 •

edited

Loading

Calinou commented Sep 17, 2022 •

edited

Loading