Update tonemapping to use new post-process material domain

filament/CMakeLists.txt

@@ -140,6 +140,7 @@ set(MATERIAL_SRCS
         src/materials/skybox.mat
         src/materials/sao.mat
         src/materials/ssao.mat
+        src/materials/tonemapping.mat
 )
 
 # Embed the binary resource blob for materials.

filament/src/PostProcessManager.cpp

@@ -46,6 +46,8 @@ PostProcessManager::PostProcessMaterial::PostProcessMaterial(FEngine& engine,
         uint8_t const* data, size_t size) noexcept {
     mMaterial = upcast(Material::Builder().package(data, size).build(engine));
     mMaterialInstance = mMaterial->getDefaultInstance();
+    // TODO: After all materials using this class have been converted to the post-process material
+    // domain, load both OPAQUE and TRANSPARENt variants here.
     mProgram = mMaterial->getProgram(0);
 }
 
@@ -89,6 +91,7 @@ void PostProcessManager::init() noexcept {
     mSSAO = PostProcessMaterial(mEngine, MATERIALS_SAO_DATA, MATERIALS_SAO_SIZE);
     mMipmapDepth = PostProcessMaterial(mEngine, MATERIALS_MIPMAPDEPTH_DATA, MATERIALS_MIPMAPDEPTH_SIZE);
     mBlur = PostProcessMaterial(mEngine, MATERIALS_BLUR_DATA, MATERIALS_BLUR_SIZE);
+    mTonemapping = PostProcessMaterial(mEngine, MATERIALS_TONEMAPPING_DATA, MATERIALS_TONEMAPPING_SIZE);
 
     // create sampler for post-process FBO
     DriverApi& driver = mEngine.getDriverApi();
@@ -158,9 +161,6 @@ FrameGraphResource PostProcessManager::toneMapping(FrameGraph& fg, FrameGraphRes
         FrameGraphResource input;
         FrameGraphResource output;
     };
-    backend::Handle<backend::HwProgram> toneMappingProgram = engine.getPostProcessProgram(
-            translucent ? PostProcessStage::TONE_MAPPING_TRANSLUCENT
-                        : PostProcessStage::TONE_MAPPING_OPAQUE);
 
     auto& ppToneMapping = fg.addPass<PostProcessToneMapping>("tonemapping",
             [&](FrameGraph::Builder& builder, PostProcessToneMapping& data) {
@@ -175,24 +175,28 @@ FrameGraphResource PostProcessManager::toneMapping(FrameGraph& fg, FrameGraphRes
                 data.output = builder.createTexture("tonemapping output", outputDesc);
                 builder.createRenderTarget(data.output);
             },
-            [=](FrameGraphPassResources const& resources,
+            [=, engine = &engine](FrameGraphPassResources const& resources,
                     PostProcessToneMapping const& data, DriverApi& driver) {
-                PipelineState pipeline;
-                pipeline.rasterState.culling = RasterState::CullingMode::NONE;
-                pipeline.rasterState.colorWrite = true;
-                pipeline.rasterState.depthFunc = RasterState::DepthFunc::A;
-                pipeline.program = toneMappingProgram;
-
-                auto const& textureDesc = resources.getDescriptor(data.input);
                 auto const& color = resources.getTexture(data.input);
-                // TODO: the first parameters below are the *actual viewport* size
-                //       (as opposed to the size of the source texture). Currently we don't allow
-                //       the texture to be resized, so they match. We'll need something more
-                //       sophisticated in the future.
 
-                mPostProcessUb.setUniform(offsetof(PostProcessingUib, dithering), dithering);
-                setSource(textureDesc.width, textureDesc.height,
-                        color, {}, textureDesc.width, textureDesc.height);
+                FMaterialInstance* pInstance = mTonemapping.getMaterialInstance();
+                pInstance->setParameter("dithering", dithering);
+                SamplerParams params;
+                pInstance->setParameter("colorBuffer", color, params);
+
+                auto duration = engine->getEngineTime();
+                float fraction = (duration.count() % 1000000000) / 1000000000.0f;
+                mPostProcessUb.setUniform(offsetof(PostProcessingUib, time), fraction);
+
+                pInstance->commit(driver);
+                pInstance->use(driver);
+
+                PipelineState pipeline;
+                pipeline.rasterState = mTonemapping.getMaterial()->getRasterState();
+                const uint8_t variant = static_cast<uint8_t> (
+                            translucent ?
+                            PostProcessVariant::TRANSLUCENT : PostProcessVariant::OPAQUE );
+                pipeline.program = mTonemapping.getMaterial()->getProgram(variant);
 
                 auto const& target = resources.getRenderTarget(data.output);
                 driver.beginRenderPass(target.target, target.params);

filament/src/PostProcessManager.h

@@ -115,6 +115,7 @@ class PostProcessManager {
     PostProcessMaterial mSSAO;
     PostProcessMaterial mMipmapDepth;
     PostProcessMaterial mBlur;
+    PostProcessMaterial mTonemapping;
 
     backend::Handle<backend::HwTexture> mNoSSAOTexture;
 };

filament/src/materials/tonemapping.mat

@@ -0,0 +1,57 @@
+material {
+    name : tonemap,
+    parameters : [
+        {
+            type : sampler2d,
+            name : colorBuffer,
+            precision: high
+        },
+        {
+            type : int,
+            name : dithering
+        }
+    ],
+    depthWrite : false,
+    depthCulling : false,
+    culling: none,
+    domain: postprocess
+}
+
+fragment {
+
+#include "../../../shaders/src/tone_mapping.fs"
+#include "../../../shaders/src/conversion_functions.fs"
+#include "../../../shaders/src/dithering.fs"
+
+    vec3 resolveFragment(const ivec2 uv) {
+        return texelFetch(materialParams_colorBuffer, uv, 0).rgb;
+    }
+
+    vec4 resolveAlphaFragment(const ivec2 uv) {
+        return texelFetch(materialParams_colorBuffer, uv, 0);
+    }
+
+    vec4 resolve() {
+#if POST_PROCESS_OPAQUE
+        vec4 color = vec4(resolveFragment(ivec2(getUV())), 1.0);
+        color.rgb  = tonemap(color.rgb);
+        color.rgb  = OECF(color.rgb);
+        color.a    = luminance(color.rgb);
+#else
+        vec4 color = resolveAlphaFragment(ivec2(getUV()));
+        color.rgb /= color.a + FLT_EPS;
+        color.rgb  = tonemap(color.rgb);
+        color.rgb  = OECF(color.rgb);
+        color.rgb *= color.a + FLT_EPS;
+#endif
+        return color;
+    }
+
+    void postProcess(inout PostProcessInputs postProcess) {
+        postProcess.color = resolve();
+        if (materialParams.dithering > 0) {
+            postProcess.color = dither(postProcess.color);
+        }
+    }
+
+}