Basic reimplementation with -sys crate, remove old code

Author: ebkalderon

Cargo.toml

@@ -14,18 +14,18 @@ default = ["glutin"]
 
 [dependencies]
 bitflags = "~1.0"
+glutin = { version = "~0.12", optional = true }
 lazy_static = "0.2.8"
+renderdoc_sys = { version = "0.1", path = "renderdoc_sys" }
 shared_library = "0.1.8"
 
-glutin = { version = "~0.12", optional = true }
-
 [target.'cfg(windows)'.dependencies]
 winapi = "~0.2.8"
 wio = "~0.1.2"
 
 [dev-dependencies]
-gfx = "0.16.2"
-gfx_window_glutin = "0.19"
+gfx = "~0.17"
+gfx_window_glutin = "~0.20"
 glutin = "~0.12"
 
 [workspace]

examples/triangle.rs

@@ -21,8 +21,8 @@ extern crate renderdoc;
 use gfx::traits::FactoryExt;
 use gfx::Device;
 use glutin::GlContext;
-use renderdoc::{OverlayBits, RenderDoc, V110};
-use renderdoc::prelude::*;
+use renderdoc::app::{OverlayBits, RenderDoc, V100};
+use renderdoc::app::api::RenderDocV100;
 
 pub type ColorFormat = gfx::format::Rgba8;
 pub type DepthFormat = gfx::format::DepthStencil;
@@ -57,7 +57,7 @@ const TRIANGLE: [Vertex; 3] = [
 const CLEAR_COLOR: [f32; 4] = [0.1, 0.2, 0.3, 1.0];
 
 pub fn main() {
-    let mut rd: RenderDoc<V110> = RenderDoc::new().unwrap();
+    let mut rd: RenderDoc<V100> = RenderDoc::new().unwrap();
 
     let mut events_loop = glutin::EventsLoop::new();
     let window_config = glutin::WindowBuilder::new()
@@ -83,25 +83,24 @@ pub fn main() {
     rd.set_active_window(window.context(), ::std::ptr::null());
     rd.set_focus_toggle_keys(&[glutin::VirtualKeyCode::F]);
     rd.set_capture_keys(&[glutin::VirtualKeyCode::C]);
-    rd.mask_overlay_bits(OverlayBits::DEFAULT, OverlayBits::DEFAULT);
 
     let mut running = true;
     while running {
         events_loop.poll_events(|event| {
             if let glutin::Event::WindowEvent { event, .. } = event {
                 match event {
-                    glutin::WindowEvent::KeyboardInput {
-                        input:
-                            glutin::KeyboardInput {
-                                virtual_keycode: Some(glutin::VirtualKeyCode::R),
-                                state: glutin::ElementState::Pressed,
-                                ..
-                            },
-                        ..
-                    } => match rd.launch_replay_ui(None) {
-                        Ok(pid) => println!("Launched replay UI ({}).", pid),
-                        Err(err) => println!("{:?}", err),
-                    },
+                    // glutin::WindowEvent::KeyboardInput {
+                    //     input:
+                    //         glutin::KeyboardInput {
+                    //             virtual_keycode: Some(glutin::VirtualKeyCode::R),
+                    //             state: glutin::ElementState::Pressed,
+                    //             ..
+                    //         },
+                    //     ..
+                    // } => match rd.launch_replay_ui(None) {
+                    //     Ok(pid) => println!("Launched replay UI ({}).", pid),
+                    //     Err(err) => println!("{:?}", err),
+                    // },
                     glutin::WindowEvent::KeyboardInput {
                         input:
                             glutin::KeyboardInput {

renderdoc_sys/Cargo.toml

@@ -2,6 +2,7 @@
 name = "renderdoc_sys"
 version = "0.1.0"
 authors = ["Eyal Kalderon <[email protected]>"]
+description = "Raw FFI bindings to the RenderDoc API"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/ebkalderon/renderdoc-rs"
 documentation = "https://docs.rs/renderdoc_sys/"

renderdoc_sys/build.rs

@@ -2,21 +2,35 @@ extern crate bindgen;
 extern crate cc;
 
 use std::env;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
+    if cfg!(feature = "app") {
+        gen_app_bindings(&out_path);
+    }
+
+    if cfg!(feature = "replay") {
+        gen_replay_bindings(&out_path);
+    }
+}
+
+fn gen_app_bindings<P: AsRef<Path>>(out_path: P) {
     let app = bindgen::Builder::default()
         .header("renderdoc/renderdoc/api/app/renderdoc_app.h")
         .whitelist_type("RENDERDOC_.*")
         .blacklist_type("__.*")
         .generate()
         .expect("Unable to generate app bindings!");
 
-    app.write_to_file(out_path.join("app.rs"))
+    app.write_to_file(out_path.as_ref().join("app.rs"))
         .expect("Couldn't write app bindings!");
+}
 
+fn gen_replay_bindings<P: AsRef<Path>>(out_path: P) {
     let replay = bindgen::Builder::default()
         .header("replay/wrapper.h")
         .clang_args(&[
@@ -54,13 +68,12 @@ fn main() {
         .whitelist_type("ReplayController")
         .whitelist_type("ReplayOutput")
         .whitelist_type("TargetControl")
-        // .opaque_type("Camera")
         .generate_inline_functions(true)
         .generate()
         .expect("Unable to generate replay bindings!");
 
     replay
-        .write_to_file(out_path.join("replay.rs"))
+        .write_to_file(out_path.as_ref().join("replay.rs"))
         .expect("Couldn't write replay bindings!");
 
     cc::Build::new()
@@ -75,7 +88,6 @@ fn main() {
         .file("replay/src/TargetControl.cpp")
         .define("RENDERDOC_PLATFORM_LINUX", None)
         .define("RENDERDOC_WINDOWING_XLIB", None)
-        .object("/usr/lib/librenderdoc.so")
         .pic(true)
         .cpp(true)
         .compile("librenderdoc.a");