Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 19e7af9841
Branches Tags
electron
/
patches
/
chromium
/
gpu_notify_when_dxdiag_request_fails.patch

gpu_notify_when_dxdiag_request_fails.patch 3.4 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Deepak Mohan <[email protected]>
    3. 

  3. Date: Fri, 28 Feb 2020 15:08:26 -0800
    4. 

  4. Subject: gpu: notify when dxdiag request for gpu info fails
    5. 

  5. 

  6. We rely on the signal OnGpuInfoUpdate to process gpu info.
    7. 

  7. When Electron wants to collect the complete info in a single run
    8. 

  8. it checks for the presence of dx_diagnostics attribute, as these
    9. 

  9. are the only async calls that happens in the gpu process, but
    10. 

  10. there are times when this call can fail due to crash or software
    11. 

  11. rendering and there is no signal from browser process on this event
    12. 

  12. to identify it.
    13. 

  13. 

  14. diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
    15. 

  15. index 0f73a8d0da336036e663927424a3a0ccba9e4f7b..e2fe4908e8e459bb277dfd6becdc486714e814ea 100644
    16. 

  16. --- a/content/browser/gpu/gpu_data_manager_impl.cc
    17. 

  17. +++ b/content/browser/gpu/gpu_data_manager_impl.cc
    18. 

  18. @@ -188,6 +188,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
    19. 

  19.    base::AutoLock auto_lock(lock_);
    20. 

  20.    private_->TerminateInfoCollectionGpuProcess();
    21. 

  21.  }
    22. 

  22. +  
    23. 

  23. +bool GpuDataManagerImpl::DxdiagDx12VulkanRequested() const {
    24. 

  24. +  base::AutoLock auto_lock(lock_);
    25. 

  25. +  return private_->DxdiagDx12VulkanRequested();
    26. 

  26. +}
    27. 

  27.  #endif
    28. 

  28.  
    29. 

  29.  void GpuDataManagerImpl::UpdateGpuFeatureInfo(
    30. 

  30. diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
    31. 

  31. index 2e069f00bb0f2c263b60662988548b246b74e5d9..82e9a19b6502aeab8f5d14098f2e5c5f995c3425 100644
    32. 

  32. --- a/content/browser/gpu/gpu_data_manager_impl.h
    33. 

  33. +++ b/content/browser/gpu/gpu_data_manager_impl.h
    34. 

  34. @@ -95,6 +95,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
    35. 

  35.    // Called from BrowserMainLoop::BrowserThreadsStarted().
    36. 

  36.    void OnBrowserThreadsStarted();
    37. 

  37.    void TerminateInfoCollectionGpuProcess();
    38. 

  38. +  bool DxdiagDx12VulkanRequested() const;
    39. 

  39.  #endif
    40. 

  40.    // Update the GPU feature info. This updates the blacklist and enabled status
    41. 

  41.    // of GPU rasterization. In the future this will be used for more features.
    42. 

  42. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
    43. 

  43. index 8ceb4ed3c6bc4759bacdf6a5922dd9a4c5e65322..a0a18214c3a4722c920ad4204a4975625130bb3c 100644
    44. 

  44. --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
    45. 

  45. +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
    46. 

  46. @@ -1059,6 +1059,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    47. 

  47.      host->ForceShutdown();
    48. 

  48.  }
    49. 

  49.  
    50. 

  50. +bool GpuDataManagerImplPrivate::DxdiagDx12VulkanRequested() const {
    51. 

  51. +  return !(gpu_info_vulkan_request_failed_ ||
    52. 

  52. +           gpu_info_dx12_request_failed_ ||
    53. 

  53. +           gpu_info_dx_diag_request_failed_);
    54. 

  54. +}
    55. 

  55.  #endif
    56. 

  56.  
    57. 

  57.  void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
    58. 

  58. diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
    59. 

  59. index ef74bd7541a2a47e71289b154221a5f5adf1e90b..100d393550d57c24bb0c9dc6d604ed925930bb07 100644
    60. 

  60. --- a/content/browser/gpu/gpu_data_manager_impl_private.h
    61. 

  61. +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
    62. 

  62. @@ -75,6 +75,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    63. 

  63.    bool VulkanRequested() const;
    64. 

  64.    void OnBrowserThreadsStarted();
    65. 

  65.    void TerminateInfoCollectionGpuProcess();
    66. 

  66. +  bool DxdiagDx12VulkanRequested() const;
    67. 

  67.  #endif
    68. 

  68.    void UpdateGpuFeatureInfo(const gpu::GpuFeatureInfo& gpu_feature_info,
    69. 

  69.                              const base::Optional<gpu::GpuFeatureInfo>&
    70.