From 1d0bdc296be7e47c9812a72451112cb3c9a8dc8b Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Thu, 3 Aug 2017 10:01:07 +0000 Subject: [PATCH] Revert "Track recreation of DxgiTextureStaging" This reverts commit ae1532a214bb949b3e2b0659293b5f6bab104598. Reason for revert: It is blocking the WebRTC roll into Chromium (see: https://chromium-review.googlesource.com/c/599707). Affected build: https://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_compile_dbg_ng/builds/469708 Original change's description: > Track recreation of DxgiTextureStaging > > I am not sure memcmp is the right tool to compare two D3D11_TEXTURE2D_DESC > instances. So the staging texture may be recreated for each frame, which hurts > the performance. > > Bug: webrtc:8046 > Change-Id: I60a94f468599b23dec168de55c9bc8c787ab9b7d > Reviewed-on: https://chromium-review.googlesource.com/592088 > Reviewed-by: Jamie Walch > Commit-Queue: Zijie He > Cr-Commit-Position: refs/heads/master@{#19193} TBR=jamiewalch@chromium.org,zijiehe@chromium.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8046 Change-Id: I57951e22be6926bcde81cdac3ca64cab9fb43338 Reviewed-on: https://chromium-review.googlesource.com/599867 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#19232} --- webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc b/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc index 2dc3c59ea9..48dc02748b 100644 --- a/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc +++ b/webrtc/modules/desktop_capture/win/dxgi_texture_staging.cc @@ -17,7 +17,6 @@ #include "webrtc/rtc_base/checks.h" #include "webrtc/rtc_base/logging.h" -#include "webrtc/system_wrappers/include/metrics.h" using Microsoft::WRL::ComPtr; @@ -45,11 +44,7 @@ bool DxgiTextureStaging::InitializeStage(ID3D11Texture2D* texture) { AssertStageAndSurfaceAreSameObject(); D3D11_TEXTURE2D_DESC current_desc; stage_->GetDesc(¤t_desc); - const bool recreate_needed = ( - memcmp(&desc, ¤t_desc, sizeof(D3D11_TEXTURE2D_DESC)) != 0); - RTC_HISTOGRAM_BOOLEAN("WebRTC.DesktopCapture.StagingTextureRecreate", - recreate_needed); - if (!recreate_needed) { + if (memcmp(&desc, ¤t_desc, sizeof(D3D11_TEXTURE2D_DESC)) == 0) { return true; }