AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANGLE D3D11: Fix build on desktop Windows

Browse Source 
This fixes a missing declaration caused by 11a2226c

Change-Id: I4b8092c6b9592e886353af9193686238105a1512
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
This commit is contained in:
Andrew Knight 2013-12-08 22:52:23 +02:00 committed by The Qt Project
parent 7900f74456
commit bcf346a766
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp vendored
View File

@ -519,7 +519,7 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
swapChainDesc.SampleDesc.Quality = 0; swapChainDesc.SampleDesc.Quality = 0;
#if !defined(ANGLE_OS_WINRT) #if !defined(ANGLE_OS_WINRT)
result = factory->CreateSwapChain(device, &swapChainDesc, &mSwapChain); HRESULT result = factory->CreateSwapChain(device, &swapChainDesc, &mSwapChain);
#else #else
IDXGISwapChain1 *swapChain; IDXGISwapChain1 *swapChain;
result = factory->CreateSwapChainForCoreWindow(device, mWindow, &swapChainDesc, NULL, &swapChain); result = factory->CreateSwapChainForCoreWindow(device, mWindow, &swapChainDesc, NULL, &swapChain);

28
src/angle/patches/0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch Normal file
View File

@ -0,0 +1,28 @@
From 8229b84ddf0134ac11412262d23515dfb7ddb177 Mon Sep 17 00:00:00 2001
From: Andrew Knight <andrew.knight@digia.com>
Date: Sun, 8 Dec 2013 22:50:38 +0200
Subject: [PATCH] ANGLE D3D11: Fix build on desktop Windows
This fixes a missing declaration caused by 11a2226c
Change-Id: I4b8092c6b9592e886353af9193686238105a1512
---
src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp
index 9770772..2fe15ff 100644
--- a/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp
+++ b/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp
@@ -519,7 +519,7 @@ EGLint SwapChain11::reset(int backbufferWidth, int backbufferHeight, EGLint swap
swapChainDesc.SampleDesc.Quality = 0;
#if !defined(ANGLE_OS_WINRT)
- result = factory->CreateSwapChain(device, &swapChainDesc, &mSwapChain);
+ HRESULT result = factory->CreateSwapChain(device, &swapChainDesc, &mSwapChain);
#else
IDXGISwapChain1 *swapChain;
result = factory->CreateSwapChainForCoreWindow(device, mWindow, &swapChainDesc, NULL, &swapChain);
--
1.8.4.msysgit.0