diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:41:47 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:42:22 +0200 |
| commit | 90297a64f203959f90041887ea31f4bd04bc059a (patch) | |
| tree | 86f8ad6a5af26fd618cdb2e20601e6df89ac94d6 /src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch | |
| parent | 537a4bc4011d32de193dc31caf09a44c1810ab33 (diff) | |
| parent | f273d6fbc02055ff3999adc0df76360ca0670435 (diff) | |
Merge branch 'stable' into dev
Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464
Diffstat (limited to 'src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch')
| -rw-r--r-- | src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch b/src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch index f58cfe2d03..b259aa3f80 100644 --- a/src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch +++ b/src/angle/patches/0001-Dynamically-resolve-functions-of-dwmapi.dll.patch @@ -1,7 +1,7 @@ -From a5ed22f7c9aa51eebbd3ec48904a4c0999dcced6 Mon Sep 17 00:00:00 2001 -From: Friedemann Kleint <Friedemann.Kleint@digia.com> -Date: Tue, 6 Nov 2012 09:22:18 +0100 -Subject: [PATCH] Dynamically resolve functions of dwmapi.dll. +From 211954dffc6a0ee52db130017ae4bea00e80748f Mon Sep 17 00:00:00 2001 +From: Friedemann Kleint <Friedemann.Klient@digia.com> +Date: Mon, 18 Mar 2013 15:35:13 +0200 +Subject: [PATCH 1/6] Dynamically resolve functions of dwmapi.dll. The library is not present on Windows XP, for which /DELAYLOAD is used in ANGLE. However, as this causes problems with MinGW, @@ -10,24 +10,24 @@ use dynamic resolution. Task-number: QTBUG-27741 Change-Id: I16214d6f98a184d89858c50ee5306371ea25469e --- - src/3rdparty/angle/src/libEGL/Surface.cpp | 39 +++++++++++++++++++++-------- + src/3rdparty/angle/src/libEGL/Surface.cpp | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/src/3rdparty/angle/src/libEGL/Surface.cpp b/src/3rdparty/angle/src/libEGL/Surface.cpp -index 732c404..34df14c 100644 +index 78203b0..5ece724 100644 --- a/src/3rdparty/angle/src/libEGL/Surface.cpp +++ b/src/3rdparty/angle/src/libEGL/Surface.cpp -@@ -73,6 +73,9 @@ Surface::~Surface() +@@ -71,6 +71,9 @@ Surface::~Surface() bool Surface::initialize() { + typedef HRESULT (STDAPICALLTYPE *PtrDwmIsCompositionEnabled)(BOOL*); + typedef HRESULT (STDAPICALLTYPE *PtrDwmSetPresentParameters)(HWND, DWM_PRESENT_PARAMETERS *); + - ASSERT(!mSwapChain && !mOffscreenTexture && !mDepthStencil); - if (!resetSwapChain()) -@@ -82,17 +85,31 @@ bool Surface::initialize() + return false; + +@@ -78,17 +81,31 @@ bool Surface::initialize() // to minimize the amount of queuing done by DWM between our calls to // present and the actual screen. if (mWindow && (getComparableOSVersion() >= versionWindowsVista)) { @@ -71,5 +71,5 @@ index 732c404..34df14c 100644 } -- -1.7.10.msysgit.1 +1.8.1.msysgit.1 |