From 9b812ce96f39481b71d9b0394288bd033220fa31 Mon Sep 17 00:00:00 2001
From: Jason Macnak <natsu@google.com>
Date: Tue, 11 Jan 2022 16:35:36 -0800
Subject: [PATCH] rutabaga_gfx: gfxstream: Update gfxstream_backend_init()

... to add the `gfxstream_callbacks` param which was added in
aosp/1927497. This param is only used in specific forks of Crosvm
but is present in the common Gfxstream project.

BUG=b:214097104
TEST=launch_cvd --gpu_mode=gfxstream

Change-Id: I3870692dd7ea55653c9761e787ff747d20df44d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3381902
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alistair Delva <adelva@google.com>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Andrew Walbran <qwandor@google.com>
Commit-Queue: Jason Macnak <natsu@google.com>
---
 rutabaga_gfx/src/gfxstream.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rutabaga_gfx/src/gfxstream.rs b/rutabaga_gfx/src/gfxstream.rs
index e31a5739af..7c24260ea9 100644
--- a/rutabaga_gfx/src/gfxstream.rs
+++ b/rutabaga_gfx/src/gfxstream.rs
@@ -46,6 +46,7 @@ extern "C" {
         renderer_cookie: *mut c_void,
         renderer_flags: i32,
         renderer_callbacks: *mut GfxstreamRendererCallbacks,
+        gfxstream_callbacks: *mut c_void,
     );
 
     // virtio-gpu-3d ioctl functions (begin)
@@ -221,6 +222,7 @@ impl Gfxstream {
                 cookie as *mut c_void,
                 gfxstream_flags.into(),
                 transmute(GFXSTREAM_RENDERER_CALLBACKS),
+                null_mut(),
             );
         }