Skip to content

Commit

Permalink
[Linux] Upstream fix for vappi with GLX.
Browse files Browse the repository at this point in the history
This fixes upstream build error when vaapi is enabled.
The fix is in Cr82, but has not been merged into Cr81.

Chromium fix:

https://chromium.googlesource.com/chromium/src/+/5b2ff215473e0526b5b24aeff4ad90d369b21c75

commit 5b2ff215473e0526b5b24aeff4ad90d369b21c75
Author: Julien Isorce <[email protected]>
Date:   Wed Feb 5 17:59:59 2020 +0000

    Fix vaapi with GLX

    The signature of ui's gl::GLImageGLX has changed a little bit
    since "mplement GpuMemoryBuffers for EGL and GLX":
      https://chromium-review.googlesource.com/c/chromium/src/+/1984712

    Bug: 1031269
  • Loading branch information
mkarolin committed Mar 19, 2020
1 parent 2577713 commit 641ec7b
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions patches/media-gpu-vaapi-vaapi_picture_tfp.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/media/gpu/vaapi/vaapi_picture_tfp.cc b/media/gpu/vaapi/vaapi_picture_tfp.cc
index 227c31b18bef0c677c0f8e9e9206cab146dabc75..b42620d74553e98f18eb4b72eddbea623b596fdf 100644
--- a/media/gpu/vaapi/vaapi_picture_tfp.cc
+++ b/media/gpu/vaapi/vaapi_picture_tfp.cc
@@ -57,7 +57,7 @@ bool VaapiTFPPicture::Initialize() {
if (make_context_current_cb_ && !make_context_current_cb_.Run())
return false;

- glx_image_ = new gl::GLImageGLX(size_, GL_RGB);
+ glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888);
if (!glx_image_->Initialize(x_pixmap_)) {
// x_pixmap_ will be freed in the destructor.
DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP";

0 comments on commit 641ec7b

Please sign in to comment.