diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2020-10-04 13:22:50 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2020-10-14 12:26:00 +0300 |
| commit | 4ff4abea88534aabdab9201140c7e610f0c709b9 (patch) | |
| tree | 70eb1e4fef41d421fc8719c3a8482067e279050d /src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp | |
| parent | ef7e3400211d275077596dd848898adb876efb6e (diff) | |
Implement image filtering
This is needed to support custom material texture filter modes when
they are being implemented using images.
Task-number: QT3DS-4183
Change-Id: I9f16a9347379872a8f04ebdd08785df345939a70
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp')
| -rw-r--r-- | src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp b/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp index 1b2e6a0..62ff5c6 100644 --- a/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp +++ b/src/runtimerender/Qt3DSRenderCustomMaterialSystem.cpp @@ -1305,8 +1305,8 @@ struct SMaterialSystem : public ICustomMaterialSystem auto *texture = image->m_TextureData.m_Texture; texture->SetTextureWrapS(image->m_HorizontalTilingMode); texture->SetTextureWrapT(image->m_VerticalTilingMode); - texture->SetMinFilter(inDefinition.m_MinFilterOp); - texture->SetMagFilter(inDefinition.m_MagFilterOp); + texture->SetMinFilter(image->m_MinFilter); + texture->SetMagFilter(image->m_MagFilter); if (inDefinition.m_MinFilterOp != NVRenderTextureMinifyingOp::Nearest && inDefinition.m_MinFilterOp != NVRenderTextureMinifyingOp::Linear && !texture->GetNumMipmaps()) { |