Merge pull request #228 from VillSnow/patch-1

fix type name Camera to CameraUniform
3 years ago · 316c429d2f
parent 76d667cd2e d13ba88020
commit 316c429d2f
2 changed files with 3 additions and 3 deletions
--- a/code/beginner/tutorial6-uniforms/src/shader.wgsl
+++ b/code/beginner/tutorial6-uniforms/src/shader.wgsl
@ -1,11 +1,11 @@
 // Vertex shader

 [[block]]
-struct Camera {
+struct CameraUniform {
    view_proj: mat4x4<f32>;
 };
 [[group(1), binding(0)]]
-var<uniform> camera: Camera;
+var<uniform> camera: CameraUniform;

 struct VertexInput {
    [[location(0)]] position: vec3<f32>;
--- a/docs/beginner/tutorial6-uniforms/README.md
+++ b/docs/beginner/tutorial6-uniforms/README.md
@ -234,7 +234,7 @@ struct CameraUniform {
    view_proj: mat4x4<f32>;
 };
 [[group(1), binding(0)]] // 2.
-var<uniform> camera: Camera;
+var<uniform> camera: CameraUniform;

 struct VertexInput {
    [[location(0)]] position: vec3<f32>;