summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJere Tuliniemi <jere.tuliniemi@qt.io>2019-06-03 16:27:45 +0300
committerJere Tuliniemi <jere.tuliniemi@qt.io>2019-06-03 16:27:45 +0300
commit036ab3848e4b7eeb3bd2f90a54be6dff6912062e (patch)
tree386846beeaba08d35ac7180df0fae6c72d397208
parenta2c58746ab3c8f90d0673c0fe259ca9981675534 (diff)
Assume QML streams have premultiplied alpha
OpenGL runtime assumes qml streams are not premultiplied causing the streams to look different to the Qt3D runtime streams. This changes the behavior to match Qt3D runtime. Task-number: QT3DS-3568 Change-Id: I28b8479b366500c709eb8aaa1dca6e38df254ff0 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
-rw-r--r--src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
index 4f274574..8afa3c01 100644
--- a/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
+++ b/src/Runtime/ogl-runtime/src/runtimerender/rendererimpl/Qt3DSRendererImplLayerRenderPreparationData.cpp
@@ -647,9 +647,7 @@ namespace render {
else
ioNextImage->m_NextImage = theImage;
- // assume offscreen renderer produces non-premultiplied image
- if (inImage.m_LastFrameOffscreenRenderer == nullptr
- && inImage.m_TextureData.m_TextureFlags.IsPreMultiplied())
+ if (inImage.m_TextureData.m_TextureFlags.IsPreMultiplied())
theKeyProp.SetPremultiplied(inShaderKey, true);
SShaderKeyTextureSwizzle &theSwizzleKeyProp =