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

gpu_notify_when_dxdiag_request_fails.patch 3.3 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970 
  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 e496fc3cab0eed155123f5fc0e3cb5c4332bfcea..db062a89b241ea7d73b01a28adf6725e9f951e4d 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. @@ -225,6 +225,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  // BUILDFLAG(IS_WIN)
    28. 

  28.  
    29. 

  29.  void GpuDataManagerImpl::PostCreateThreads() {
    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 c57305681efb469d296c90df68b6cdbea927580d..6dda1a5465e08df64b539ee203b7c40386d16e72 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. @@ -121,6 +121,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
    35. 

  35.    bool Dx12Requested() const;
    36. 

  36.    bool VulkanRequested() const;
    37. 

  37.    void TerminateInfoCollectionGpuProcess();
    38. 

  38. +  bool DxdiagDx12VulkanRequested() const;
    39. 

  39.  #endif
    40. 

  40.    // Called from BrowserMainLoop::PostCreateThreads().
    41. 

  41.    // TODO(content/browser/gpu/OWNERS): This should probably use a
    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 019554cca7d25be443b75271278865e09a763a31..cc7e01260891c5d42ef590b040209f01943e1feb 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. @@ -1199,6 +1199,12 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
    47. 

  47.    if (host)
    48. 

  48.      host->ForceShutdown();
    49. 

  49.  }
    50. 

  50. +
    51. 

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

  52. +  return !(gpu_info_vulkan_request_failed_ ||
    53. 

  53. +           gpu_info_dx12_request_failed_ ||
    54. 

  54. +           gpu_info_dx_diag_request_failed_);
    55. 

  55. +}
    56. 

  56.  #endif
    57. 

  57.  
    58. 

  58.  void GpuDataManagerImplPrivate::PostCreateThreads() {
    59. 

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

  60. index 790e72f12c7f1cf6e49d2a51949769a5d14bd4db..e02c3033231f93792fe2b456c08cfc2ac0f3d49e 100644
    61. 

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

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

  63. @@ -86,6 +86,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    64. 

  64.    bool Dx12Requested() const;
    65. 

  65.    bool VulkanRequested() const;
    66. 

  66.    void TerminateInfoCollectionGpuProcess();
    67. 

  67. +  bool DxdiagDx12VulkanRequested() const;
    68. 

  68.  #endif
    69. 

  69.    void PostCreateThreads();
    70. 

  70.    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
    71.