From bcf346a76659f896a25f31aa44f64ba5f28ba8e1 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Sun, 8 Dec 2013 22:52:23 +0200 Subject: ANGLE D3D11: Fix build on desktop Windows This fixes a missing declaration caused by 11a2226c Change-Id: I4b8092c6b9592e886353af9193686238105a1512 Reviewed-by: Maurice Kalinowski --- .../angle/src/libGLESv2/renderer/SwapChain11.cpp | 2 +- ...-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/angle/patches/0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch (limited to 'src') diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/SwapChain11.cpp index 9770772194..2fe15ff5b8 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); diff --git a/src/angle/patches/0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch b/src/angle/patches/0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch new file mode 100644 index 0000000000..99f458bc28 --- /dev/null +++ b/src/angle/patches/0016-ANGLE-D3D11-Fix-build-on-desktop-Windows.patch @@ -0,0 +1,28 @@ +From 8229b84ddf0134ac11412262d23515dfb7ddb177 Mon Sep 17 00:00:00 2001 +From: Andrew Knight +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 + -- cgit v1.2.3