wayland-egl.patch 2.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-10-07 09:38:47.000000000 -0700
  2. +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-10-08 14:09:34.550174093 -0700
  3. @@ -698,7 +698,6 @@
  4. // The X11/ANGLE implementation can use |vaapi_wrapper_| to copy from an
  5. // internal libva buffer into an X Pixmap without having to use a processing
  6. // wrapper.
  7. -#if !defined(USE_X11)
  8. // If we aren't in BufferAllocationMode::kNone, we have to allocate a
  9. // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's
  10. // internal decoded frame.
  11. @@ -708,6 +707,7 @@
  12. VaapiWrapper::kVideoProcess, VAProfileNone,
  13. base::Bind(&ReportVaapiErrorToUMA,
  14. "Media.VaapiVideoDecodeAccelerator.Vpp.VAAPIError"));
  15. +#if !defined(USE_X11)
  16. RETURN_AND_NOTIFY_ON_FAILURE(vpp_vaapi_wrapper_,
  17. "Failed to initialize VppVaapiWrapper",
  18. PLATFORM_FAILURE, );
  19. @@ -715,11 +715,15 @@
  20. RETURN_AND_NOTIFY_ON_FAILURE(
  21. vpp_vaapi_wrapper_->CreateContext(gfx::Size()),
  22. "Failed to create Context", PLATFORM_FAILURE, );
  23. +#else
  24. + if (vpp_vaapi_wrapper_)
  25. + vpp_vaapi_wrapper_->CreateContext(gfx::Size());
  26. +#endif // !defined(USE_X11)
  27. }
  28. - vaapi_wrapper_for_picture = vpp_vaapi_wrapper_;
  29. + vaapi_wrapper_for_picture = (vpp_vaapi_wrapper_)?
  30. + vpp_vaapi_wrapper_:vaapi_wrapper_for_picture;
  31. }
  32. -#endif // !defined(USE_X11)
  33. for (size_t i = 0; i < buffers.size(); ++i) {
  34. // TODO(b/139460315): Create with buffers[i] once the AMD driver issue is
  35. --- a/ui/gl/gl_image_native_pixmap.cc 2020-05-18 11:40:06.000000000 -0700
  36. +++ b/ui/gl/gl_image_native_pixmap.cc 2020-05-22 02:07:16.007770442 -0700
  37. @@ -288,6 +288,8 @@
  38. std::move(scoped_fd));
  39. }
  40. + handle.planes[0].size = size_.GetArea();
  41. +
  42. return handle;
  43. #endif // !defined(OS_FUCHSIA)
  44. }
  45. --- a/gpu/command_buffer/service/error_state.cc 2020-05-18 11:39:22.000000000 -0700
  46. +++ b/gpu/command_buffer/service/error_state.cc 2020-05-22 13:43:09.181180388 -0700
  47. @@ -115,6 +115,8 @@
  48. // buffer.
  49. error = GL_NO_ERROR;
  50. }
  51. + if (error == GL_INVALID_ENUM)
  52. + error = GL_NO_ERROR;
  53. return error;
  54. }