diff --git a/Cappy3ds/src/main.rs b/Cappy3ds/src/main.rs deleted file mode 100644 index e04113c..0000000 --- a/Cappy3ds/src/main.rs +++ /dev/null @@ -1,5 +0,0 @@ -mod capture; - -fn main() { - capture::do_capture(); -} diff --git a/build_win_dll.bat b/build_win_dll.bat index 79a5cae..335b530 100644 --- a/build_win_dll.bat +++ b/build_win_dll.bat @@ -1,2 +1,2 @@ cargo build -xcopy .\target\debug\libcappy3ds.dll .\win\ /Y \ No newline at end of file +xcopy .\target\debug\cappy3ds_render.dll .\win\ /Y \ No newline at end of file diff --git a/cappy3ds_render/src/dsscreen.rs b/cappy3ds_render/src/dsscreen.rs index e688bf6..09d0563 100644 --- a/cappy3ds_render/src/dsscreen.rs +++ b/cappy3ds_render/src/dsscreen.rs @@ -288,10 +288,12 @@ impl DSScreen { resolve_target: None, ops: wgpu::Operations { load: wgpu::LoadOp::Load, - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, + occlusion_query_set: None, + timestamp_writes: None, }); render_pass.set_pipeline(&self.render_pipeline); diff --git a/cappy3ds_render/src/render.rs b/cappy3ds_render/src/render.rs index 010a01c..c444f00 100644 --- a/cappy3ds_render/src/render.rs +++ b/cappy3ds_render/src/render.rs @@ -178,7 +178,7 @@ impl State { b: 0.3, a: 1.0, }), - store: true, + store: wgpu::StoreOp::Store, }, })], depth_stencil_attachment: None, diff --git a/win/App.xaml.cs b/win/App.xaml.cs index ce240a0..1d0fe24 100644 --- a/win/App.xaml.cs +++ b/win/App.xaml.cs @@ -46,8 +46,6 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar { m_window = new MainWindow(); m_window.Activate(); - - CsBindgen.NativeMethods.hello_world(); } private Window m_window; diff --git a/win/Cappy3ds.csproj b/win/Cappy3ds.csproj index a6193aa..f452ce3 100644 --- a/win/Cappy3ds.csproj +++ b/win/Cappy3ds.csproj @@ -1,4 +1,4 @@ - + WinExe net6.0-windows10.0.19041.0 @@ -38,6 +38,9 @@ + + PreserveNewest + PreserveNewest