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

gpu_notify_when_dxdiag_request_fails.patch 3.2 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 b26a3c72aa63b81f8f4558b28b404faf138a897b..335dc385eb03bc9634387af44dfd1aa3bfa71cb6 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. @@ -230,6 +230,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::UpdateDawnInfo(
    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 4364da656ac02f2f717e713f37d29ce44c14242b..ba044aee23db495e1da69c5bc0a807e96783faa9 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. @@ -124,6 +124,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
    35. 

  35.    // BrowserMainParts override instead.
    36. 

  36.    void PostCreateThreads();
    37. 

  37.    void TerminateInfoCollectionGpuProcess();
    38. 

  38. +  bool DxdiagDx12VulkanRequested() const;
    39. 

  39.  #endif
    40. 

  40.    void UpdateDawnInfo(const std::vector<std::string>& dawn_info_list);
    41. 

  41.  
    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 972bb4e8ba2d1470ed5f24c125551e3e627d79e4..d3b15d35eb458c00e470569904924c28c7a3957d 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. @@ -1211,6 +1211,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::UpdateDawnInfo(
    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 81f6abb91a3fdefc1b0128f3224c7b82bfcbd0d2..99980e3528f4660bf1205e44326645d97e762cb9 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. @@ -89,6 +89,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
    64. 

  64.    bool VulkanRequested() const;
    65. 

  65.    void PostCreateThreads();
    66. 

  66.    void TerminateInfoCollectionGpuProcess();
    67. 

  67. +  bool DxdiagDx12VulkanRequested() const;
    68. 

  68.  #endif
    69. 

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

  70.  
    71.