merged

Author: trigpolynom

crates/optix_device/src/lib.rs

@@ -1,5 +1,4 @@
 #![cfg_attr(target_os = "cuda", feature(asm_experimental_arch))]
-#[cfg(target_os = "cuda")]
 use core::arch::asm;
 
 extern crate alloc;

examples/cuda/cpu/path_tracer/src/common.rs

@@ -1,4 +1,4 @@
-use glutin::event::{
+use glium::glutin::event::{
     ElementState, Event, MouseButton, MouseScrollDelta, VirtualKeyCode, WindowEvent,
 };
 use path_tracer_gpu::Viewport;

examples/cuda/cpu/path_tracer/src/optix/mod.rs

@@ -1,3 +1,5 @@
+use std::ops::Index;
+
 use crate::cuda::CudaRendererBuffers;
 use anyhow::Result;
 use cust::{
@@ -135,8 +137,10 @@ impl OptixRenderer {
         let mut build_inputs = Vec::with_capacity(buf.len());
         let mut aabb_slices = Vec::with_capacity(buf.len());
 
+        let dev_slice = buf.as_slice();
+
         for i in 0..buf.len() {
-            aabb_slices.push(*buf.index(i));
+            aabb_slices.push(&dev_slice[i]);
         }
         for i in 0..buf.len() {
             build_inputs.push(CustomPrimitiveArray::new(

examples/cuda/cpu/path_tracer/src/renderer.rs

@@ -1,4 +1,7 @@
-use glutin::{event::Event, event_loop::ControlFlow};
+use glium::glutin::{
+        event_loop::ControlFlow, 
+        event::Event,
+    };
 use imgui::Ui;
 use path_tracer_gpu::scene::Scene;
 use sysinfo::{System, SystemExt};

examples/cuda/cpu/path_tracer/src/viewer.rs

@@ -2,19 +2,26 @@ use glium::{
     implement_vertex,
     index::{NoIndices, PrimitiveType},
     texture::{RawImage2d, SrgbTexture2d},
+    glutin::{
+        window::WindowBuilder, 
+        event_loop::{EventLoop, ControlFlow}, 
+        ContextBuilder, 
+        event::{Event, WindowEvent},
+        dpi::PhysicalSize
+    },
     uniform, Display, Program, Rect, Surface, VertexBuffer,
 };
-use glutin::{
-    dpi::PhysicalSize,
-    event::{Event, WindowEvent},
-    event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder,
-    ContextBuilder,
-};
+// use glutin::{
+//     dpi::PhysicalSize,
+    // event::{Event, WindowEvent},
+    // event_loop::{ControlFlow, EventLoop},
+    // ContextBuilder,
+// };
+
 use imgui::Condition;
 use imgui_winit_support::{HiDpiMode, WinitPlatform};
 use path_tracer_gpu::scene::Scene;
-use std::time::Instant;
+use std::{ops::Deref, time::Instant};
 use vek::Vec2;
 
 use crate::{common::Camera, renderer::Renderer, HEIGHT, WIDTH};
@@ -55,9 +62,9 @@ pub fn run(camera: &Camera, scene: &Scene) -> ! {
     let event_loop = EventLoop::new();
     let wb = WindowBuilder::new()
         .with_title("Render")
-        .with_inner_size(PhysicalSize::new(WIDTH, HEIGHT));
+        .with_inner_size(PhysicalSize::new(WIDTH as f64, HEIGHT as f64)); // Explicitly specify f64
     let cb = ContextBuilder::new().with_vsync(true);
-    let display = Display::new(wb, cb, &event_loop).unwrap();
+    let display = Display::new(wb, cb, event_loop.deref()).unwrap();
     let renderer = Renderer::new(Vec2::new(WIDTH as usize, HEIGHT as usize), camera, scene);
     let mut viewer = ViewerRenderer::new(display, renderer);
 
@@ -183,9 +190,9 @@ impl ViewerRenderer {
             ..
         } = self;
         let ui = self.imgui_ctx.frame();
-        let out = imgui::Window::new("crab")
+        let out = ui.window("crab")
             .size([300.0, 300.0], Condition::FirstUseEver)
-            .build(&ui, || renderer.render(&ui))
+            .build(|| renderer.render(&ui))
             .unwrap();
 
         let raw =
@@ -221,7 +228,8 @@ impl ViewerRenderer {
         let gl_window = display.gl_window();
         platform.prepare_render(&ui, gl_window.window());
 
-        imgui_renderer.render(&mut target, ui.render()).unwrap();
+        let draw_data = self.imgui_ctx.render();
+        imgui_renderer.render(&mut target, draw_data).unwrap();
         target.finish().unwrap();
     }
 }