summary refs log tree commit diff
path: root/gpu_display/src/gpu_display_x.rs
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2019-11-22 17:26:46 -0800
committerCommit Bot <commit-bot@chromium.org>2019-11-26 21:05:44 +0000
commit2b0bc61ea718f468b570676225df96a40be3164a (patch)
tree91bb68880ec3461d8f2737d15e773748cfc29d1f /gpu_display/src/gpu_display_x.rs
parent6f8823abb55e2d9f65cf7abe5635c59280fcf172 (diff)
downloadcrosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar.gz
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar.bz2
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar.lz
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar.xz
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.tar.zst
crosvm-2b0bc61ea718f468b570676225df96a40be3164a.zip
gpu_display: amend GpuDisplay to import and attach EventDevices
This change also includes stubs for the wayland and x11 impls.

TEST=compiles
BUG=chromium:1023975

Change-Id: Ia2bcb5c2ed75ea47071dd77e149e60901a56595c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1930407
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Noah Gold <nkgold@google.com>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'gpu_display/src/gpu_display_x.rs')
-rw-r--r--gpu_display/src/gpu_display_x.rs11
1 files changed, 10 insertions, 1 deletions
diff --git a/gpu_display/src/gpu_display_x.rs b/gpu_display/src/gpu_display_x.rs
index 837a151..1df7fc2 100644
--- a/gpu_display/src/gpu_display_x.rs
+++ b/gpu_display/src/gpu_display_x.rs
@@ -22,7 +22,7 @@ use std::rc::Rc;
 
 use libc::{shmat, shmctl, shmdt, shmget, IPC_CREAT, IPC_PRIVATE, IPC_RMID};
 
-use crate::{DisplayT, GpuDisplayError, GpuDisplayFramebuffer};
+use crate::{DisplayT, EventDevice, GpuDisplayError, GpuDisplayFramebuffer};
 
 use data_model::VolatileSlice;
 
@@ -638,6 +638,15 @@ impl DisplayT for DisplayX {
     fn set_position(&mut self, surface_id: u32, x: u32, y: u32) {
         // unsupported
     }
+    fn import_event_device(&mut self, _event_device: EventDevice) -> Result<u32, GpuDisplayError> {
+        Err(GpuDisplayError::Unsupported)
+    }
+    fn release_event_device(&mut self, _event_device_id: u32) {
+        // unsupported
+    }
+    fn attach_event_device(&mut self, surface_id: u32, event_device_id: u32) {
+        // unsupported
+    }
 }
 
 impl AsRawFd for DisplayX {