From 1e78d8b45a76a61e17a40917cc69dac1a6be4d81 Mon Sep 17 00:00:00 2001 From: Cong Liu Date: Wed, 20 Jul 2016 13:08:36 +0800 Subject: [PATCH] Removed angle patch for nw17 This patch should not be necessary since [cd9aa12afc83b9765ac78b6683f7f17fc03a8f42](https://chromium.googlesource.com/angle/angle/+/cd9aa12afc83b9765ac78b6683f7f17fc03a8f42). fixed #5108 --- patch/patch.cfg | 4 ---- patch/patches/angle.patch | 33 --------------------------------- 2 files changed, 37 deletions(-) delete mode 100644 patch/patches/angle.patch diff --git a/patch/patch.cfg b/patch/patch.cfg index a68c0d195b..76b837fd9a 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -7,10 +7,6 @@ patches = [ 'name': 'ffmpeg', 'path': 'src/third_party/ffmpeg/', }, - { - 'name': 'angle', - 'path': 'src/third_party/angle/', - }, { 'name': 'webrtc_window_capturer', 'path': 'src/third_party/webrtc/', diff --git a/patch/patches/angle.patch b/patch/patches/angle.patch deleted file mode 100644 index 75557e5960..0000000000 --- a/patch/patches/angle.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp b/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp -index ac6bda6..45a71e5 100644 ---- src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp -+++ src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow11Win32.cpp -@@ -138,6 +138,7 @@ HRESULT NativeWindow11Win32::createSwapChain(ID3D11Device *device, - } - mVisual->SetContent(swapChain1); - mCompositionTarget->SetRoot(mVisual); -+ result = factory2->MakeWindowAssociation(getNativeWindow(), DXGI_MWA_NO_ALT_ENTER); - SafeRelease(factory2); - return result; - } -@@ -168,6 +169,7 @@ HRESULT NativeWindow11Win32::createSwapChain(ID3D11Device *device, - { - *swapChain = static_cast(swapChain1); - } -+ result = factory2->MakeWindowAssociation(getNativeWindow(), DXGI_MWA_NO_ALT_ENTER); - SafeRelease(factory2); - return result; - } -@@ -190,7 +192,11 @@ HRESULT NativeWindow11Win32::createSwapChain(ID3D11Device *device, - swapChainDesc.Windowed = TRUE; - swapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; - -- return factory->CreateSwapChain(device, &swapChainDesc, swapChain); -+ HRESULT result = factory->CreateSwapChain(device, &swapChainDesc, swapChain); -+ if (FAILED(result)) { -+ return result; -+ } -+ return factory->MakeWindowAssociation(getNativeWindow(), DXGI_MWA_NO_ALT_ENTER); - } - - void NativeWindow11Win32::commitChange()