WIP renderdoc support

Smithay · Dec 22, 2021 · 02e582b · 02e582b
1 parent 587e604
commit 02e582b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml
@@ -20,6 +20,7 @@ slog-async = "2.2"
 slog-stdlog = "4.1.0"
 slog-scope = "4.4.0"
 xkbcommon = "0.4.0"
+renderdoc = "0.10.1"
 
 [dependencies.smithay]
 path = ".."

diff --git a/anvil/src/state.rs b/anvil/src/state.rs
@@ -55,6 +55,7 @@ pub struct AnvilState<BackendData> {
     // things we must keep alive
     #[cfg(feature = "xwayland")]
     pub xwayland: XWayland<AnvilState<BackendData>>,
+    pub renderdoc: Option<renderdoc::RenderDoc<renderdoc::V141>>,
 }
 
 impl<BackendData: Backend + 'static> AnvilState<BackendData> {
@@ -240,6 +241,7 @@ impl<BackendData: Backend + 'static> AnvilState<BackendData> {
             start_time: std::time::Instant::now(),
             #[cfg(feature = "xwayland")]
             xwayland,
+            renderdoc: renderdoc::RenderDoc::new().ok(),
         }
     }
 }

diff --git a/anvil/src/x11.rs b/anvil/src/x11.rs
@@ -203,6 +203,7 @@ pub fn run_x11(log: Logger) {
     state.start_xwayland();
 
     info!(log, "Initialization completed, starting the main loop.");
+
 
     while state.running.load(Ordering::SeqCst) {
         let mut space = state.space.borrow_mut();
@@ -226,6 +227,9 @@ pub fn run_x11(log: Logger) {
                 continue;
             }
 
+            if let Some(mut renderdoc) = state.renderdoc.as_mut() {
+                renderdoc.start_frame_capture(renderer.egl.context, std::ptr::null());
+            }
             // TODO fullscreen surface
 
             let mut elements = Vec::new();
@@ -283,6 +287,10 @@ pub fn run_x11(log: Logger) {
                 }
                 _ => {}
             }
+
+            if let Some(mut renderdoc) = state.renderdoc.as_mut() {
+                renderdoc.end_frame_capture(renderer.egl.context, std::ptr::null());
+            }
 
             #[cfg(feature = "debug")]
             state.backend_data.fps.tick();

diff --git a/src/backend/egl/context.rs b/src/backend/egl/context.rs
@@ -13,7 +13,7 @@ use slog::{info, o, trace};
 /// EGL context for rendering
 #[derive(Debug)]
 pub struct EGLContext {
-    context: ffi::egl::types::EGLContext,
+    pub context: ffi::egl::types::EGLContext,
     pub(crate) display: EGLDisplay,
     config_id: ffi::egl::types::EGLConfig,
     pixel_format: Option<PixelFormat>,

diff --git a/src/backend/renderer/gles2/mod.rs b/src/backend/renderer/gles2/mod.rs
@@ -172,7 +172,7 @@ pub struct Gles2Renderer {
     solid_program: Gles2SolidProgram,
     #[cfg(feature = "wayland_frontend")]
     dmabuf_cache: std::collections::HashMap<WeakDmabuf, Gles2Texture>,
-    egl: EGLContext,
+    pub egl: EGLContext,
     #[cfg(all(feature = "wayland_frontend", feature = "use_system_lib"))]
     egl_reader: Option<EGLBufferReader>,
     vbos: [ffi::types::GLuint; 2],