|
 |
026eb22 |
From 8e649097b0e11d8b975ba321f343142dd97889cb Mon Sep 17 00:00:00 2001
|
|
|
026eb22 |
From: Oliver Wolff <oliver.wolff@qt.io>
|
|
|
026eb22 |
Date: Wed, 22 Aug 2018 13:12:07 +0200
|
|
|
026eb22 |
Subject: [PATCH 5/8] ANGLE: Fix initialization of zero-sized window
|
|
|
47cae49 |
|
|
|
47cae49 |
The clientRect might be empty when creating a window of zero size. The
|
|
|
47cae49 |
side effect of a division by zero is that matrix transformation fails
|
|
|
47cae49 |
and hence the swapchain gets into an invalid state.
|
|
|
47cae49 |
|
|
|
47cae49 |
Change-Id: Idbaed72deadb7b87052ac27e194a40d1810e6f7a
|
|
|
47cae49 |
---
|
|
|
47cae49 |
.../libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp | 4 ++--
|
|
|
47cae49 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
47cae49 |
|
|
|
47cae49 |
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
|
|
026eb22 |
index c6d07fc888..3425fad95d 100644
|
|
|
47cae49 |
--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
|
|
47cae49 |
+++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
|
|
026eb22 |
@@ -324,8 +324,8 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
|
|
|
47cae49 |
|
|
|
47cae49 |
HRESULT SwapChainPanelNativeWindow::scaleSwapChain(const Size &windowSize, const RECT &clientRect)
|
|
|
47cae49 |
{
|
|
|
026eb22 |
- Size renderScale = {windowSize.Width / (float)clientRect.right,
|
|
|
026eb22 |
- windowSize.Height / (float)clientRect.bottom};
|
|
|
47cae49 |
+ Size renderScale = {windowSize.Width / std::max(LONG(1), clientRect.right),
|
|
|
47cae49 |
+ windowSize.Height / std::max(LONG(1), clientRect.bottom)};
|
|
|
47cae49 |
// Setup a scale matrix for the swap chain
|
|
|
47cae49 |
DXGI_MATRIX_3X2_F scaleMatrix = {};
|
|
|
47cae49 |
scaleMatrix._11 = renderScale.Width;
|
|
|
47cae49 |
--
|
|
|
026eb22 |
2.15.0.windows.1
|
|
|
47cae49 |
|