More changes

DDRBoxman · Oct 29, 2023 · 7835465 · 7835465
1 parent ee6ec0a
commit 7835465
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/Cappy3ds/src/main.rs b/Cappy3ds/src/main.rs
diff --git a/build_win_dll.bat b/build_win_dll.bat
@@ -1,2 +1,2 @@
 cargo build
-xcopy .\target\debug\libcappy3ds.dll .\win\ /Y
+xcopy .\target\debug\cappy3ds_render.dll .\win\ /Y
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
@@ -38,6 +38,9 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
+    <None Update="cappy3ds_render.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="libcappy3ds.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>