--address hbao image transparency oddness (#2214)

facebookresearch · Sep 26, 2023 · 9826bd1 · 9826bd1
1 parent 4b7f3cd
commit 9826bd1
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 6 deletions.
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-sblur-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-sblur-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-sblur.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom-sblur.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-geom.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-sblur-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-sblur-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-sblur.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered-sblur.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-layered.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-sblur-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-sblur-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-sblur.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-sblur.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-sblur-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-sblur-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-sblur.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong-sblur.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache-strong.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-cache.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-cache.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-sblur-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-sblur-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-sblur.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-sblur.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-strong-ortho.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-strong-ortho.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-strong.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic-strong.png
diff --git a/data/test_assets/hbao_tests/van-gogh-room.hbao-classic.png b/data/test_assets/hbao_tests/van-gogh-room.hbao-classic.png
diff --git a/src/esp/gfx/RenderTarget.cpp b/src/esp/gfx/RenderTarget.cpp
@@ -204,9 +204,6 @@ struct RenderTarget::Impl {
     if (!hbao_) {
       return;
     }
-    // TODO:Support a toggle between cache-aware and classic algorithm. For now
-    // we just use cache aware
-    bool useCacheAware = true;
 
     hbao_->drawEffect(visualSensor_->getProjectionMatrix(),
                       gfx_batch::HbaoType::CacheAware, depthRenderTexture_,

diff --git a/src/esp/gfx_batch/Hbao.cpp b/src/esp/gfx_batch/Hbao.cpp
@@ -882,7 +882,9 @@ void Hbao::drawHbaoBlur(Mn::GL::AbstractFramebuffer& output) {
   Mn::GL::Renderer::enable(Mn::GL::Renderer::Feature::Blending);
   Mn::GL::Renderer::setBlendFunction(
       Mn::GL::Renderer::BlendFunction::Zero,
-      Mn::GL::Renderer::BlendFunction::SourceColor);
+      Mn::GL::Renderer::BlendFunction::SourceColor,
+      Mn::GL::Renderer::BlendFunction::Zero,
+      Mn::GL::Renderer::BlendFunction::One);
   // TODO multi samples masking
 
   // Only special blur
@@ -944,7 +946,9 @@ void Hbao::drawClassicInternal(Mn::GL::AbstractFramebuffer& output) {
     Mn::GL::Renderer::enable(Mn::GL::Renderer::Feature::Blending);
     Mn::GL::Renderer::setBlendFunction(
         Mn::GL::Renderer::BlendFunction::Zero,
-        Mn::GL::Renderer::BlendFunction::SourceColor);
+        Mn::GL::Renderer::BlendFunction::SourceColor,
+        Mn::GL::Renderer::BlendFunction::Zero,
+        Mn::GL::Renderer::BlendFunction::One);
     // TODO Set sample mask if samples > 1
   } else {
     state_->hbaoCalc.mapForDraw(Mn::GL::Framebuffer::ColorAttachment{0}).bind();
@@ -1054,7 +1058,9 @@ void Hbao::drawCacheAwareInternal(Mn::GL::AbstractFramebuffer& output) {
     Mn::GL::Renderer::enable(Mn::GL::Renderer::Feature::Blending);
     Mn::GL::Renderer::setBlendFunction(
         Mn::GL::Renderer::BlendFunction::Zero,
-        Mn::GL::Renderer::BlendFunction::SourceColor);
+        Mn::GL::Renderer::BlendFunction::SourceColor,
+        Mn::GL::Renderer::BlendFunction::Zero,
+        Mn::GL::Renderer::BlendFunction::One);
     // TODO Set sample mask if samples > 1
 
   } else {