From 21feff0cf9b4b2a0ebe89a4aaf09c4db7a234535 Mon Sep 17 00:00:00 2001 From: iwek7 Date: Fri, 10 Nov 2023 14:56:16 +0100 Subject: [PATCH 1/3] Add missing space in shader --- code/beginner/tutorial5-textures/src/shader.wgsl | 2 +- docs/beginner/tutorial5-textures/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/beginner/tutorial5-textures/src/shader.wgsl b/code/beginner/tutorial5-textures/src/shader.wgsl index 34eeb644..656aac80 100644 --- a/code/beginner/tutorial5-textures/src/shader.wgsl +++ b/code/beginner/tutorial5-textures/src/shader.wgsl @@ -24,7 +24,7 @@ fn vs_main( @group(0) @binding(0) var t_diffuse: texture_2d; -@group(0)@binding(1) +@group(0) @binding(1) var s_diffuse: sampler; @fragment diff --git a/docs/beginner/tutorial5-textures/README.md b/docs/beginner/tutorial5-textures/README.md index 7b0f8ee7..0a808c9d 100644 --- a/docs/beginner/tutorial5-textures/README.md +++ b/docs/beginner/tutorial5-textures/README.md @@ -400,7 +400,7 @@ Now that we have our vertex shader outputting our `tex_coords`, we need to chang @group(0) @binding(0) var t_diffuse: texture_2d; -@group(0)@binding(1) +@group(0) @binding(1) var s_diffuse: sampler; @fragment From a821dbb22d27169312810a81124dd26cafd09e23 Mon Sep 17 00:00:00 2001 From: clonidine Date: Mon, 27 Nov 2023 13:45:11 -0300 Subject: [PATCH 2/3] fix: removing unused import --- code/beginner/tutorial5-textures/src/texture.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/beginner/tutorial5-textures/src/texture.rs b/code/beginner/tutorial5-textures/src/texture.rs index 1c639b6b..ff38f20c 100644 --- a/code/beginner/tutorial5-textures/src/texture.rs +++ b/code/beginner/tutorial5-textures/src/texture.rs @@ -1,5 +1,3 @@ -use std::num::NonZeroU32; - use anyhow::*; use image::GenericImageView; From 128815a25cd7b4994a98972fec09e477714e7651 Mon Sep 17 00:00:00 2001 From: clonidine Date: Mon, 27 Nov 2023 14:14:19 -0300 Subject: [PATCH 3/3] fix: removing unused imports --- code/beginner/tutorial6-uniforms/src/texture.rs | 2 -- code/beginner/tutorial7-instancing/src/texture.rs | 2 -- code/beginner/tutorial9-models/src/texture.rs | 1 - 3 files changed, 5 deletions(-) diff --git a/code/beginner/tutorial6-uniforms/src/texture.rs b/code/beginner/tutorial6-uniforms/src/texture.rs index 1c639b6b..ff38f20c 100644 --- a/code/beginner/tutorial6-uniforms/src/texture.rs +++ b/code/beginner/tutorial6-uniforms/src/texture.rs @@ -1,5 +1,3 @@ -use std::num::NonZeroU32; - use anyhow::*; use image::GenericImageView; diff --git a/code/beginner/tutorial7-instancing/src/texture.rs b/code/beginner/tutorial7-instancing/src/texture.rs index 1c639b6b..ff38f20c 100644 --- a/code/beginner/tutorial7-instancing/src/texture.rs +++ b/code/beginner/tutorial7-instancing/src/texture.rs @@ -1,5 +1,3 @@ -use std::num::NonZeroU32; - use anyhow::*; use image::GenericImageView; diff --git a/code/beginner/tutorial9-models/src/texture.rs b/code/beginner/tutorial9-models/src/texture.rs index 9727d225..edc7669b 100644 --- a/code/beginner/tutorial9-models/src/texture.rs +++ b/code/beginner/tutorial9-models/src/texture.rs @@ -1,6 +1,5 @@ use anyhow::*; use image::GenericImageView; -use std::num::NonZeroU32; pub struct Texture { pub texture: wgpu::Texture,