Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 6 insertions, 0 deletions

diff --git a/examples/integration/src/shader/vert.wgsl b/examples/integration/src/shader/vert.wgsl
new file mode 100644
index 00000000..e353e6ba
--- /dev/null
+++ b/examples/integration/src/shader/vert.wgsl
@@ -0,0 +1,6 @@
+@vertex
+fn main(@builtin(vertex_index) in_vertex_index: u32) -> @builtin(position) vec4<f32> {
+    let x = f32(1 - i32(in_vertex_index)) * 0.5;
+    let y = f32(1 - i32(in_vertex_index & 1u) * 2) * 0.5;
+    return vec4<f32>(x, y, 0.0, 1.0);
+}