Dead code elimination

This commit is contained in:
Alan Jeffrey 2019-04-09 14:58:28 -05:00 committed by Josh Matthews
parent 4c1e532f7f
commit bc89d88222
3 changed files with 1 additions and 102 deletions

1
Cargo.lock generated
View File

@ -945,7 +945,6 @@ version = "0.1.0"
dependencies = [
"gl 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"pathfinder_geometry 0.3.0",
"pathfinder_gpu 0.1.0",
"pathfinder_renderer 0.1.0",

View File

@ -1,4 +1,3 @@
use crate::magicleap::MagicLeapLandscape;
use crate::magicleap::MagicLeapLogger;
use crate::magicleap::MagicLeapWindow;
@ -9,7 +8,6 @@ use egl::EGLSurface;
use gl::types::GLuint;
use log::debug;
use log::info;
use pathfinder_demo::Background;
@ -19,7 +17,6 @@ use pathfinder_demo::UIVisibility;
use pathfinder_demo::window::Event;
use pathfinder_demo::window::Mode;
use pathfinder_demo::window::SVGPath;
use pathfinder_demo::window::WindowSize;
use pathfinder_geometry::basic::point::Point2DI32;
use pathfinder_geometry::basic::point::Point2DF32;
use pathfinder_geometry::basic::rect::RectI32;
@ -30,7 +27,6 @@ use pathfinder_gpu::Device;
use pathfinder_gpu::resources::FilesystemResourceLoader;
use pathfinder_renderer::gpu::renderer::Renderer;
use pathfinder_simd::default::F32x4;
use pathfinder_renderer::scene::Scene;
use pathfinder_renderer::z_buffer::ZBuffer;
use pathfinder_renderer::gpu_data::BuiltScene;
use pathfinder_renderer::builder::SceneBuilder;
@ -39,8 +35,6 @@ use pathfinder_renderer::builder::RenderTransform;
use pathfinder_svg::BuiltSVG;
use pathfinder_gpu::resources::ResourceLoader;
use rayon::ThreadPoolBuilder;
use std::collections::HashMap;
use std::ffi::CStr;
use std::ffi::CString;
@ -64,7 +58,7 @@ struct ImmersiveApp {
}
#[no_mangle]
pub unsafe extern "C" fn magicleap_pathfinder_demo_init(egl_display: EGLDisplay, egl_context: EGLContext) -> *mut c_void {
pub extern "C" fn magicleap_pathfinder_demo_init(egl_display: EGLDisplay, egl_context: EGLContext) -> *mut c_void {
unsafe { c_api::MLLoggingLog(c_api::MLLogLevel::Info, &b"Pathfinder Demo\0"[0], &b"Initializing\0"[0]) };
let tag = CString::new("Pathfinder Demo").unwrap();
@ -128,15 +122,6 @@ struct MagicLeapPathfinder {
resources: FilesystemResourceLoader,
}
struct MagicLeapPathfinderSurface {
surf: EGLSurface,
size: Point2DI32,
viewport: RectI32,
bg_color: F32x4,
renderer: Renderer<GLDevice>,
scene: Scene,
}
#[repr(C)]
pub struct MagicLeapPathfinderRenderOptions {
display: EGLDisplay,
@ -156,10 +141,6 @@ pub extern "C" fn magicleap_pathfinder_init() -> *mut c_void {
log::set_boxed_logger(Box::new(logger)).unwrap();
log::set_max_level(level);
info!("Initialized logging");
let mut thread_pool_builder = ThreadPoolBuilder::new()
.build_global().unwrap();
info!("Initialized rayon");
gl::load_with(|s| egl::get_proc_address(s) as *const c_void);
info!("Initialized gl");

View File

@ -35,7 +35,6 @@ use egl;
use egl::EGL_NO_SURFACE;
use egl::EGLContext;
use egl::EGLDisplay;
use egl::EGLSurface;
use gl;
use gl::types::GLuint;
@ -296,86 +295,6 @@ impl Drop for MagicLeapWindow {
}
}
// Magic Leap landscape app
pub struct MagicLeapLandscape {
pub dpy: EGLDisplay,
pub surf: EGLSurface,
pub fbo: GLuint,
size: Point2DI32,
resource_loader: FilesystemResourceLoader,
}
impl Window for MagicLeapLandscape {
fn resource_loader(&self) -> &dyn ResourceLoader {
&self.resource_loader
}
fn gl_version(&self) -> GLVersion {
GLVersion::GLES3
}
fn gl_default_framebuffer(&self) -> GLuint {
self.fbo
}
fn mouse_position(&self) -> Point2DI32 {
Point2DI32::new(0, 0)
}
fn create_user_event_id (&self) -> u32 {
0
}
fn push_user_event(_: u32, _: u32) {
}
fn present_open_svg_dialog(&mut self) {
}
fn run_save_dialog(&self, _: &str) -> Result<PathBuf, ()> {
Err(())
}
fn view_box_size(&self, _mode: Mode) -> Point2DI32 {
self.size
}
fn make_current(&mut self, _mode: Mode, _eye: Option<u32>) -> RectI32 {
RectI32::new(Point2DI32::new(0, 0), self.size)
}
fn present(&mut self) {
}
}
impl MagicLeapLandscape {
pub fn new(dpy: EGLDisplay, surf: EGLSurface) -> MagicLeapLandscape {
gl::load_with(get_proc_address);
let size = Point2DI32::new(512, 512);
let fbo = 0;
let resource_loader = FilesystemResourceLoader::locate();
MagicLeapLandscape {
dpy,
surf,
fbo,
size,
resource_loader,
}
}
pub fn window_size(&self) -> WindowSize {
WindowSize {
logical_size: self.size,
backing_scale_factor: 1.0,
}
}
pub fn set_size(&mut self, width: i32, height: i32) {
self.size = Point2DI32::new(width, height);
}
}
// Logging
pub struct MagicLeapLogger {