From 0061883dbfb47e119a9018bbeef25d2b4e124365 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 10 Jul 2023 12:48:54 -0700 Subject: [PATCH] Fix dynamic resolution with quality > low and translucency (#6940) The scene graph was using the wrong boolean to decide whether to fallback to low quality upscaling when the render target is translucent. It was instead only looking at the view's blending mode. We need to check both, as color grading does in the same function. --- NEW_RELEASE_NOTES.md | 1 + .../android/filament/transparentrendering/MainActivity.kt | 6 +++--- filament/src/details/Renderer.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NEW_RELEASE_NOTES.md b/NEW_RELEASE_NOTES.md index d835bea931..6acd0480bb 100644 --- a/NEW_RELEASE_NOTES.md +++ b/NEW_RELEASE_NOTES.md @@ -8,4 +8,5 @@ appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md). ## Release notes for next branch cut +- rendering: dynamic resolution would not work with a translucent render target and quality > low - Java/Kotlin: user callbacks were not invoked on successful texture upload diff --git a/android/samples/sample-transparent-view/src/main/java/com/google/android/filament/transparentrendering/MainActivity.kt b/android/samples/sample-transparent-view/src/main/java/com/google/android/filament/transparentrendering/MainActivity.kt index 19cfecd0ad..5991d7e47c 100644 --- a/android/samples/sample-transparent-view/src/main/java/com/google/android/filament/transparentrendering/MainActivity.kt +++ b/android/samples/sample-transparent-view/src/main/java/com/google/android/filament/transparentrendering/MainActivity.kt @@ -140,9 +140,9 @@ class MainActivity : Activity() { camera = engine.createCamera(engine.entityManager.create()) // clear the swapchain with transparent pixels - val options = renderer.clearOptions - options.clear = true - renderer.clearOptions = options + renderer.clearOptions = renderer.clearOptions.apply { + clear = true + } } private fun setupView() { diff --git a/filament/src/details/Renderer.cpp b/filament/src/details/Renderer.cpp index ec09b44bc4..3b01c13420 100644 --- a/filament/src/details/Renderer.cpp +++ b/filament/src/details/Renderer.cpp @@ -1050,7 +1050,7 @@ void FRenderer::renderJob(ArenaScope& arena, FView& view) { if (scaled) { mightNeedFinalBlit = false; auto viewport = DEBUG_DYNAMIC_SCALING ? xvp : vp; - input = ppm.upscale(fg, blendModeTranslucent, dsrOptions, input, xvp, { + input = ppm.upscale(fg, needsAlphaChannel, dsrOptions, input, xvp, { .width = viewport.width, .height = viewport.height, .format = colorGradingConfig.ldrFormat }); xvp.left = xvp.bottom = 0;