Merge #218

218: Change NDC Y axis r=kvark a=kvark

Blocked on gfx-rs/wgpu#537

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>

Cargo.toml

@@ -27,19 +27,19 @@ vulkan = ["wgn/vulkan-portability"]
 package = "wgpu-native"
 version = "0.4"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "08e8d406c175579da5ef18c1abf4d6c00e2a9726"
+rev = "caf7be0d73584ce4ca095c4ba08eba1c175edd06"
 
 [dependencies.wgc]
 package = "wgpu-core"
 version = "0.1"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "08e8d406c175579da5ef18c1abf4d6c00e2a9726"
+rev = "caf7be0d73584ce4ca095c4ba08eba1c175edd06"
 
 [dependencies.wgt]
 package = "wgpu-types"
 version = "0.1"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "08e8d406c175579da5ef18c1abf4d6c00e2a9726"
+rev = "caf7be0d73584ce4ca095c4ba08eba1c175edd06"
 
 [dependencies]
 arrayvec = "0.5"
@@ -61,4 +61,9 @@ futures = "0.3"
 #[patch."https://github.com/gfx-rs/wgpu"]
 #wgc = { version = "0.1.0", package = "wgpu-core", path = "../wgpu/wgpu-core" }
 #wgt = { version = "0.1.0", package = "wgpu-types", path = "../wgpu/wgpu-types" }
-#wgn = { version = "0.4.0", package = "wgpu-native", path = "../wgpu/wgpu-native" }
+#wgn = { version = "0.4.0", package = "wgpu-native", path = "../wgpu/wgpu-native" }
+
+#[patch.crates-io]
+#gfx-hal = { version = "0.5", path = "../gfx/src/hal" }
+#gfx-backend-metal = { version = "0.5", path = "../gfx/src/backend/metal" }
+#gfx-backend-vulkan = { version = "0.5", path = "../gfx/src/backend/vulkan" }

examples/framework.rs

@@ -4,7 +4,7 @@ use winit::event::WindowEvent;
 #[allow(unused)]
 pub const OPENGL_TO_WGPU_MATRIX: cgmath::Matrix4<f32> = cgmath::Matrix4::new(
     1.0, 0.0, 0.0, 0.0,
-    0.0, -1.0, 0.0, 0.0,
+    0.0, 1.0, 0.0, 0.0,
     0.0, 0.0, 0.5, 0.0,
     0.0, 0.0, 0.5, 1.0,
 );

examples/shadow/forward.frag

@@ -32,9 +32,11 @@ float fetch_shadow(int light_id, vec4 homogeneous_coords) {
     if (homogeneous_coords.w <= 0.0) {
         return 1.0;
     }
+    // compensate for the Y-flip difference between the NDC and texture coordinates
+    const vec2 flip_correction = vec2(0.5, -0.5);
     // compute texture coordinates for shadow lookup
     vec4 light_local = vec4(
-        (homogeneous_coords.xy/homogeneous_coords.w + 1.0) / 2.0,
+        homogeneous_coords.xy * flip_correction/homogeneous_coords.w + 0.5,
         light_id,
         homogeneous_coords.z / homogeneous_coords.w
     );