Desktop: Remove winit fork, fix nix package, and improve rendering (#3307)

* reduce triangle count

* switch to winit repo after changes where upstreamed

* fix nix pkg

Author: timon-schelling

.nix/flake.nix

@@ -107,7 +107,6 @@
             allowBuiltinFetchGit = true;
           };
 
-          
           # TODO: Remove the need for this hash by using individual package resolutions and hashes from package-lock.json
           npmDeps = pkgs.fetchNpmDeps {
             inherit (finalAttrs) pname version;
@@ -131,7 +130,10 @@
           buildPhase = ''
             export HOME="$TMPDIR"
 
-            npm run build-desktop
+            pushd frontend
+            npm run build-native
+            popd
+            cargo build -r -p graphite-desktop
           '';
 
           installPhase = ''
@@ -144,7 +146,7 @@
             mkdir -p $out/share/icons/hicolor/scalable/apps
             cp $src/desktop/assets/graphite-icon-color.svg $out/share/icons/hicolor/scalable/apps/
           '';
-          
+
           doCheck = false;
 
           postFixup = ''

Cargo.lock

@@ -134,7 +134,7 @@ web-sys = { version = "=0.3.77", features = [
 	"HtmlImageElement",
 	"ImageBitmapRenderingContext",
 ] }
-winit = { git = "https://github.com/timon-schelling/winit.git", rev = "37221c7192ef1deec022a2278e54429331c01bad" }
+winit = { git = "https://github.com/rust-windowing/winit.git" }
 url = "2.5"
 tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
 vello = { git = "https://github.com/linebender/vello.git", rev = "87cc5bee6d3a34d15017dbbb58634ddc7f33ff9b" } # TODO switch back to stable when a release is made

Cargo.toml

@@ -8,15 +8,9 @@ fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput {
 	var out: VertexOutput;
 
 	let pos = array(
-		// 1st triangle
-		vec2f( -1.0, -1.0), // center
-		vec2f( 1.0, -1.0), // right, center
-		vec2f( -1.0, 1.0), // center, top
-
-		// 2nd triangle
-		vec2f( -1.0, 1.0), // center, top
-		vec2f( 1.0, -1.0), // right, center
-		vec2f( 1.0, 1.0), // right, top
+		vec2f( -1.0, -1.0),
+		vec2f( 3.0, -1.0),
+		vec2f( -1.0, 3.0),
 	);
 	let xy = pos[vertex_index];
 	out.clip_position = vec4f(xy , 0.0, 1.0);