Filament targets c++20 by default (#9080)

2025-08-11 22:59:21 -07:00
parent f91ba0867e
commit af0f395884
9 changed files with 45 additions and 52 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,9 +331,9 @@ endif()
 # ==================================================================================================
 # General compiler flags
 # ==================================================================================================
-set(CXX_STANDARD "-std=c++17")
+set(CXX_STANDARD "-std=c++20")
 if (WIN32)
-    set(CXX_STANDARD "/std:c++17")
+    set(CXX_STANDARD "/std:c++20")
 endif()

 if (MSVC)
--- a/NEW_RELEASE_NOTES.md
+++ b/NEW_RELEASE_NOTES.md
@@ -14,3 +14,4 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
  depth-only passes. [**Requires recompiling materials**]
 - material: fix specularFactor in `LOW_QUALITY` mode. [**Requires recompiling materials**] to take effect.
 - material: Add CRC32 validation for material packages [⚠️ **New Material Version**]
+- Filament is now targeting c++20 (was previously c++17)
--- a/filament/CMakeLists.txt
+++ b/filament/CMakeLists.txt
@@ -728,13 +728,6 @@ else()
            -Wover-aligned
            -Werror
    )
-    if (CMAKE_CXX_STANDARD EQUAL 20)
-        # The lambdas for passes in PostProcessManager.cpp capture this
-        # implicitly in a way that's deprecated in c++20, but can't easily be
-        # fixed in a way that's backwards compatible with c++17:
-        # https://www.nextptr.com/tutorial/ta1430524603/capture-this-in-lambda-expression-timeline-of-change
-        list(APPEND FILAMENT_WARNINGS -Wno-deprecated-this-capture)
-    endif()
 endif()

 target_compile_options(${TARGET} PRIVATE
--- a/filament/README.md
+++ b/filament/README.md
@@ -99,7 +99,7 @@ main: main.o
 	$(CC) -Llib/x86_64/ main.o $(FILAMENT_LIBS) -lpthread -lc++ -ldl -o main

 main.o: main.cpp
-	$(CC) -Iinclude/ -std=c++17 -pthread -c main.cpp
+	$(CC) -Iinclude/ -std=c++20 -pthread -c main.cpp

 clean:
 	rm -f main main.o
@@ -119,7 +119,7 @@ main: main.o
 	$(CC) -Llib/$(ARCH)/ main.o $(FILAMENT_LIBS) $(FRAMEWORKS) -o main

 main.o: main.cpp
-	$(CC) -Iinclude/ -std=c++17 -c main.cpp
+	$(CC) -Iinclude/ -std=c++20 -c main.cpp

 clean:
 	rm -f main main.o
@@ -148,7 +148,7 @@ main.exe: main.obj
 	gdi32.lib user32.lib opengl32.lib

 main.obj: main.cpp
-	$(CC) /MT /Iinclude\\ /std:c++17 /c main.cpp
+	$(CC) /MT /Iinclude\\ /std:c++20 /c main.cpp

 clean:
 	del main.exe main.obj
--- a/filament/backend/include/private/backend/CommandStream.h
+++ b/filament/backend/include/private/backend/CommandStream.h
@@ -197,7 +197,10 @@ public:
    #define DEBUG_COMMAND_END(methodName, sync) mDriver.debugCommandEnd(this, sync, #methodName)
 #else
    #define DEBUG_COMMAND_BEGIN(methodName, sync, ...)
-    #define DEBUG_COMMAND_END(methodName, sync)
+    // For the line "AutoExecute callOnExit([=, this](){",
+    // "this" will be unused for release build since DEBUG_COMMAND_END is a no-op. So we add the
+    // following workaround.
+    #define DEBUG_COMMAND_END(methodName, sync) ((void)(this));
 #endif

 class CommandStream {
@@ -229,7 +232,7 @@ public:
 #define DECL_DRIVER_API_SYNCHRONOUS(RetType, methodName, paramsDecl, params)                    \
    inline RetType methodName(paramsDecl) {                                                     \
        DEBUG_COMMAND_BEGIN(methodName, true, params);                                          \
-        AutoExecute callOnExit([=](){                                                           \
+        AutoExecute callOnExit([=, this](){                                                     \
            DEBUG_COMMAND_END(methodName, true);                                                \
        });                                                                                     \
        return apply(&Driver::methodName, mDriver, std::forward_as_tuple(params));              \
--- a/filament/src/PostProcessManager.cpp
+++ b/filament/src/PostProcessManager.cpp
@@ -580,7 +580,7 @@ PostProcessManager::StructurePassOutput PostProcessManager::structure(FrameGraph
                        .clearFlags = TargetBufferFlags::COLOR0 | TargetBufferFlags::DEPTH
                });
            },
-            [=, passBuilder = passBuilder](FrameGraphResources const& resources,
+            [=, this, passBuilder = passBuilder](FrameGraphResources const& resources,
                    auto const&, DriverApi& driver) mutable {
                Variant structureVariant(Variant::DEPTH_VARIANT);
                structureVariant.setPicking(config.picking);
@@ -624,7 +624,7 @@ PostProcessManager::StructurePassOutput PostProcessManager::structure(FrameGraph
                    });
                }
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                getStructureDescriptorSet().bind(driver);
                bindPerRenderableDescriptorSet(driver);

@@ -690,7 +690,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::transparentPicking(FrameGrap
                            .clearFlags = TargetBufferFlags::COLOR0 | TargetBufferFlags::DEPTH
                        });
                },
-                [=, passBuilder = passBuilder](FrameGraphResources const& resources,
+                [=, this, passBuilder = passBuilder](FrameGraphResources const& resources,
                    auto const&, DriverApi& driver) mutable {
                        Variant pickingVariant(Variant::DEPTH_VARIANT);
                        pickingVariant.setPicking(true);
@@ -954,7 +954,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::screenSpaceAmbientOcclusion(
                        .clearFlags = TargetBufferFlags::COLOR0 | TargetBufferFlags::COLOR1
                });
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                // bind the per-view descriptorSet that is used for the structure pass
                getStructureDescriptorSet().bind(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -1148,7 +1148,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::bilateralBlurPass(FrameGraph
                        .clearFlags = TargetBufferFlags::COLOR0 | TargetBufferFlags::COLOR1
                });
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                // TODO: the structure descriptor set might not be the best fit.
                getStructureDescriptorSet().bind(driver);
@@ -1316,7 +1316,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::gaussianBlurPass(FrameGraph&
                data.temp = builder.declareRenderPass(data.temp);
                data.out = builder.declareRenderPass(output);
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -1794,7 +1794,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                        }
                });
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);

@@ -1854,7 +1854,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                    });
                }
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -1932,7 +1932,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                    });
                    data.outTilesCocMinMax = builder.declareRenderPass(data.outTilesCocMinMax);
                },
-                [=](FrameGraphResources const& resources,
+                [=, this](FrameGraphResources const& resources,
                        auto const& data, DriverApi& driver) {
                    bindPostProcessDescriptorSet(driver);
                    bindPerRenderableDescriptorSet(driver);
@@ -1970,7 +1970,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                    data.outTilesCocMinMax = builder.createTexture("dof dilated tiles output", inputDesc);
                    data.outTilesCocMinMax = builder.declareRenderPass(data.outTilesCocMinMax );
                },
-                [=](FrameGraphResources const& resources,
+                [=, this](FrameGraphResources const& resources,
                        auto const& data, DriverApi& driver) {
                    bindPostProcessDescriptorSet(driver);
                    bindPerRenderableDescriptorSet(driver);
@@ -2027,7 +2027,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                        .attachments = { .color = { data.outColor, data.outAlpha }}
                });
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);

@@ -2093,7 +2093,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                        .attachments = { .color = { data.outColor, data.outAlpha }}
                });
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);

@@ -2142,7 +2142,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::dof(FrameGraph& fg,
                data.output = builder.createTexture("DoF output", inputDesc);
                data.output = builder.declareRenderPass(data.output);
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -2181,7 +2181,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::downscalePass(FrameGraph& fg
                data.output = builder.createTexture("Downsample-output", outDesc);
                builder.declareRenderPass(data.output);
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -2316,7 +2316,7 @@ PostProcessManager::BloomPassOutput PostProcessManager::bloom(FrameGraph& fg,
                    builder.declareRenderPass(out, &data.outRT[i]);
                }
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -2373,7 +2373,7 @@ PostProcessManager::BloomPassOutput PostProcessManager::bloom(FrameGraph& fg,
                    builder.declareRenderPass(out, &data.outRT[i]);
                }
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto hwOut = resources.getTexture(data.out);
@@ -2434,7 +2434,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::flarePass(FrameGraph& fg,
                });
                data.out = builder.declareRenderPass(data.out);
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -2578,7 +2578,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::customResolveUncompressPass(
                        .attachments = { .color = { data.inout }}
                });
            },
-            [=](FrameGraphResources const& resources, auto const&, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const&, DriverApi& driver) {
                customResolvePrepareSubpass(driver, CustomResolveOp::UNCOMPRESS);
                auto out = resources.getRenderPassInfo();
                out.params.subpassMask = 1;
@@ -2656,7 +2656,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::colorGrading(FrameGraph& fg,
                    }
                }
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto colorTexture = resources.getTexture(data.input);
@@ -2752,7 +2752,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::fxaa(FrameGraph& fg,
                });
                data.output = builder.declareRenderPass(data.output);
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto const& inDesc = resources.getDescriptor(data.input);
@@ -2971,7 +2971,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::taa(FrameGraph& fg,
                        .attachments = { .color = { data.output, data.tonemappedOutput }}
                });
            },
-            [=, &current](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this, &current](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);

@@ -3113,7 +3113,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::rcas(
                data.output = builder.createTexture("FFX FSR1 Rcas output", outDesc);
                data.output = builder.declareRenderPass(data.output);
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -3470,7 +3470,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::blit(FrameGraph& fg, bool co
                        .attachments = { .color = { data.output }},
                        .clearFlags = TargetBufferFlags::DEPTH });
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -3573,7 +3573,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::blitDepth(FrameGraph& fg,
                builder.declareRenderPass(builder.getName(data.output),
                        {.attachments = {.depth = {data.output}}});
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                getStructureDescriptorSet().bind(driver);
                bindPerRenderableDescriptorSet(driver);
                auto depth = resources.getTexture(data.input);
@@ -3692,7 +3692,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::resolveDepth(FrameGraph& fg,
                        .attachments = { .depth = { data.output }},
                        .clearFlags = TargetBufferFlags::DEPTH });
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto const& input = resources.getTexture(data.input);
@@ -3730,7 +3730,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::vsmMipmapPass(FrameGraph& fg
                    .clearFlags = TargetBufferFlags::COLOR
                });
            },
-            [=](FrameGraphResources const& resources,
+            [=, this](FrameGraphResources const& resources,
                    auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
@@ -3788,7 +3788,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::debugShadowCascades(FrameGra
                data.output = builder.createTexture("Shadow Cascade Debug", desc);
                builder.declareRenderPass(data.output);
            },
-            [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+            [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto color = resources.getTexture(data.color);
@@ -3835,7 +3835,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::debugCombineArrayTexture(Fra
                    .attachments = {.color = { data.output }},
                    .clearFlags = TargetBufferFlags::DEPTH });
        },
-        [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+        [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                bindPostProcessDescriptorSet(driver);
                bindPerRenderableDescriptorSet(driver);
                auto color = resources.getTexture(data.input);
@@ -3918,7 +3918,7 @@ FrameGraphId<FrameGraphTexture> PostProcessManager::debugDisplayShadowTexture(
                            .attachments = { .color = { data.color }}
                    });
                },
-                [=](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
+                [=, this](FrameGraphResources const& resources, auto const& data, DriverApi& driver) {
                    bindPostProcessDescriptorSet(driver);
                    bindPerRenderableDescriptorSet(driver);
                    auto const out = resources.getRenderPassInfo();
--- a/filament/src/ShadowMapManager.cpp
+++ b/filament/src/ShadowMapManager.cpp
@@ -337,7 +337,8 @@ FrameGraphId<FrameGraphTexture> ShadowMapManager::render(FEngine& engine, FrameG
                // "read" from one of its resource (only writes), so the FrameGraph culls it.
                builder.sideEffect();
            },
-            [=, passBuilder = passBuilder,
+            [=, this,
+                    passBuilder = passBuilder,
                    &engine = const_cast<FEngine /*const*/ &>(engine), // FIXME: we want this const
                    &view = const_cast<FView const&>(view)]
                    (FrameGraphResources const&, auto const& data, DriverApi& driver) mutable {
--- a/libs/filamat/README.md
+++ b/libs/filamat/README.md
@@ -93,7 +93,7 @@ main: main.o
 	$(CC) -Llib/x86_64/ -stdlib=libc++ main.o $(FILAMENT_LIBS) -lpthread -ldl -o main

 main.o: main.cpp
-	$(CC) -Iinclude/ -std=c++17 -stdlib=libc++ -pthread -c main.cpp
+	$(CC) -Iinclude/ -std=c++20 -stdlib=libc++ -pthread -c main.cpp

 clean:
 	rm -f main main.o
@@ -111,7 +111,7 @@ main: main.o
 	$(CC) -Llib/x86_64/ main.o $(FILAMENT_LIBS) -o main

 main.o: main.cpp
-	$(CC) -Iinclude/ -std=c++17 -c main.cpp
+	$(CC) -Iinclude/ -std=c++20 -c main.cpp

 clean:
 	rm -f main main.o
@@ -138,7 +138,7 @@ main.exe: main.obj
 	$(CC) main.obj $(FILAMENT_LIBS) gdi32.lib user32.lib opengl32.lib

 main.obj: main.cpp
-	$(CC) /MT /Iinclude/ /std:c++17 /c main.cpp
+	$(CC) /MT /Iinclude/ /std:c++20 /c main.cpp

 clean:
 	del main.exe main.obj
--- a/libs/gltfio/CMakeLists.txt
+++ b/libs/gltfio/CMakeLists.txt
@@ -197,11 +197,6 @@ if (WEBGL_PTHREADS)
 endif()

 set(GLTFIO_WARNINGS -Wall -Werror)
-if (CMAKE_CXX_STANDARD EQUAL 20)
-    # The following things used by AssetLoader.cpp are deprecated in c++20:
-    # wstring_convert and std::codecvt_utf8<char32_t>.
-    list(APPEND GLTFIO_WARNINGS -Wno-deprecated-declarations)
-endif()
 if (NOT MSVC)
    target_compile_options(gltfio_core PRIVATE ${GLTFIO_WARNINGS})
 endif()