From 0d620b7701f427ed0091f3640ab9ca0e116eb412 Mon Sep 17 00:00:00 2001 From: Artur Sapek Date: Wed, 1 Jan 2020 15:44:32 -0700 Subject: Implement Geometry2D primitive --- wgpu/src/shader/geom2d.frag | 8 ++++++++ wgpu/src/shader/geom2d.frag.spv | Bin 0 -> 372 bytes wgpu/src/shader/geom2d.vert | 17 +++++++++++++++++ wgpu/src/shader/geom2d.vert.spv | Bin 0 -> 1468 bytes 4 files changed, 25 insertions(+) create mode 100644 wgpu/src/shader/geom2d.frag create mode 100644 wgpu/src/shader/geom2d.frag.spv create mode 100644 wgpu/src/shader/geom2d.vert create mode 100644 wgpu/src/shader/geom2d.vert.spv (limited to 'wgpu/src/shader') diff --git a/wgpu/src/shader/geom2d.frag b/wgpu/src/shader/geom2d.frag new file mode 100644 index 00000000..e39c45e7 --- /dev/null +++ b/wgpu/src/shader/geom2d.frag @@ -0,0 +1,8 @@ +#version 450 + +layout(location = 0) in vec4 i_Color; +layout(location = 0) out vec4 o_Color; + +void main() { + o_Color = i_Color; +} diff --git a/wgpu/src/shader/geom2d.frag.spv b/wgpu/src/shader/geom2d.frag.spv new file mode 100644 index 00000000..c0165bca Binary files /dev/null and b/wgpu/src/shader/geom2d.frag.spv differ diff --git a/wgpu/src/shader/geom2d.vert b/wgpu/src/shader/geom2d.vert new file mode 100644 index 00000000..fd86ecd6 --- /dev/null +++ b/wgpu/src/shader/geom2d.vert @@ -0,0 +1,17 @@ +#version 450 + +layout(location = 0) in vec2 i_Position; +layout(location = 1) in vec4 i_Color; + +layout(location = 0) out vec4 o_Color; + +layout (set = 0, binding = 0) uniform Globals { + mat4 u_Transform; + float u_Scale; +}; + +void main() { + vec2 p_Position = i_Position * u_Scale; + gl_Position = u_Transform * vec4(p_Position, 0.0, 1.0); + o_Color = i_Color; +} diff --git a/wgpu/src/shader/geom2d.vert.spv b/wgpu/src/shader/geom2d.vert.spv new file mode 100644 index 00000000..c15c7451 Binary files /dev/null and b/wgpu/src/shader/geom2d.vert.spv differ -- cgit From 5ca98b113e49bfb2372b245a985f957611a0a1ac Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 2 Jan 2020 19:25:00 +0100 Subject: Rename `Geometry2D` to `Mesh2D` and move it to `iced_wgpu` --- wgpu/src/shader/geom2d.frag | 8 -------- wgpu/src/shader/geom2d.frag.spv | Bin 372 -> 0 bytes wgpu/src/shader/geom2d.vert | 17 ----------------- wgpu/src/shader/geom2d.vert.spv | Bin 1468 -> 0 bytes wgpu/src/shader/triangle.frag | 8 ++++++++ wgpu/src/shader/triangle.frag.spv | Bin 0 -> 372 bytes wgpu/src/shader/triangle.vert | 17 +++++++++++++++++ wgpu/src/shader/triangle.vert.spv | Bin 0 -> 1468 bytes 8 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 wgpu/src/shader/geom2d.frag delete mode 100644 wgpu/src/shader/geom2d.frag.spv delete mode 100644 wgpu/src/shader/geom2d.vert delete mode 100644 wgpu/src/shader/geom2d.vert.spv create mode 100644 wgpu/src/shader/triangle.frag create mode 100644 wgpu/src/shader/triangle.frag.spv create mode 100644 wgpu/src/shader/triangle.vert create mode 100644 wgpu/src/shader/triangle.vert.spv (limited to 'wgpu/src/shader') diff --git a/wgpu/src/shader/geom2d.frag b/wgpu/src/shader/geom2d.frag deleted file mode 100644 index e39c45e7..00000000 --- a/wgpu/src/shader/geom2d.frag +++ /dev/null @@ -1,8 +0,0 @@ -#version 450 - -layout(location = 0) in vec4 i_Color; -layout(location = 0) out vec4 o_Color; - -void main() { - o_Color = i_Color; -} diff --git a/wgpu/src/shader/geom2d.frag.spv b/wgpu/src/shader/geom2d.frag.spv deleted file mode 100644 index c0165bca..00000000 Binary files a/wgpu/src/shader/geom2d.frag.spv and /dev/null differ diff --git a/wgpu/src/shader/geom2d.vert b/wgpu/src/shader/geom2d.vert deleted file mode 100644 index fd86ecd6..00000000 --- a/wgpu/src/shader/geom2d.vert +++ /dev/null @@ -1,17 +0,0 @@ -#version 450 - -layout(location = 0) in vec2 i_Position; -layout(location = 1) in vec4 i_Color; - -layout(location = 0) out vec4 o_Color; - -layout (set = 0, binding = 0) uniform Globals { - mat4 u_Transform; - float u_Scale; -}; - -void main() { - vec2 p_Position = i_Position * u_Scale; - gl_Position = u_Transform * vec4(p_Position, 0.0, 1.0); - o_Color = i_Color; -} diff --git a/wgpu/src/shader/geom2d.vert.spv b/wgpu/src/shader/geom2d.vert.spv deleted file mode 100644 index c15c7451..00000000 Binary files a/wgpu/src/shader/geom2d.vert.spv and /dev/null differ diff --git a/wgpu/src/shader/triangle.frag b/wgpu/src/shader/triangle.frag new file mode 100644 index 00000000..e39c45e7 --- /dev/null +++ b/wgpu/src/shader/triangle.frag @@ -0,0 +1,8 @@ +#version 450 + +layout(location = 0) in vec4 i_Color; +layout(location = 0) out vec4 o_Color; + +void main() { + o_Color = i_Color; +} diff --git a/wgpu/src/shader/triangle.frag.spv b/wgpu/src/shader/triangle.frag.spv new file mode 100644 index 00000000..11201872 Binary files /dev/null and b/wgpu/src/shader/triangle.frag.spv differ diff --git a/wgpu/src/shader/triangle.vert b/wgpu/src/shader/triangle.vert new file mode 100644 index 00000000..fd86ecd6 --- /dev/null +++ b/wgpu/src/shader/triangle.vert @@ -0,0 +1,17 @@ +#version 450 + +layout(location = 0) in vec2 i_Position; +layout(location = 1) in vec4 i_Color; + +layout(location = 0) out vec4 o_Color; + +layout (set = 0, binding = 0) uniform Globals { + mat4 u_Transform; + float u_Scale; +}; + +void main() { + vec2 p_Position = i_Position * u_Scale; + gl_Position = u_Transform * vec4(p_Position, 0.0, 1.0); + o_Color = i_Color; +} diff --git a/wgpu/src/shader/triangle.vert.spv b/wgpu/src/shader/triangle.vert.spv new file mode 100644 index 00000000..bc39c451 Binary files /dev/null and b/wgpu/src/shader/triangle.vert.spv differ -- cgit