Rename "Uniform" to "Camera" in labels too

code/beginner/tutorial6-uniforms/src/challenge.rs

@@ -342,7 +342,7 @@ impl State {
         camera_staging.update_camera(&mut camera_uniform);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial6-uniforms/src/main.rs

@@ -326,7 +326,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial7-instancing/src/challenge.rs

@@ -423,7 +423,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial7-instancing/src/main.rs

@@ -387,7 +387,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial8-depth/src/challenge.rs

@@ -585,7 +585,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial8-depth/src/main.rs

@@ -397,7 +397,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/beginner/tutorial9-models/src/main.rs

@@ -318,7 +318,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/intermediate/tutorial10-lighting/src/main.rs

@@ -409,7 +409,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });
@@ -622,8 +622,11 @@ impl State {
             (cgmath::Quaternion::from_axis_angle((0.0, 1.0, 0.0).into(), cgmath::Deg(1.0))
                 * old_position)
                 .into();
-        self.queue
-            .write_buffer(&self.light_buffer, 0, bytemuck::cast_slice(&[self.light_uniform]));
+        self.queue.write_buffer(
+            &self.light_buffer,
+            0,
+            bytemuck::cast_slice(&[self.light_uniform]),
+        );
     }
 
     fn render(&mut self) -> Result<(), wgpu::SwapChainError> {

code/intermediate/tutorial11-normals/src/main.rs

@@ -430,7 +430,7 @@ impl State {
         camera_uniform.update_view_proj(&camera);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/intermediate/tutorial12-camera/src/main.rs

@@ -304,7 +304,7 @@ impl State {
         camera_uniform.update_view_proj(&camera, &projection);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/intermediate/tutorial13-threading/src/main.rs

@@ -303,7 +303,7 @@ impl State {
         camera_uniform.update_view_proj(&camera, &projection);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/showcase/compute/src/main.rs

@@ -234,7 +234,7 @@ impl State {
         camera_uniform.update_view_proj(&camera, &projection);
 
         let camera_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[camera_uniform]),
             usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
         });

code/showcase/framework/src/lib.rs

@@ -106,7 +106,7 @@ impl CameraUniform {
             view_proj: cgmath::Matrix4::identity(),
         };
         let buffer = device.create_buffer_init(&BufferInitDescriptor {
-            label: Some("Uniform Buffer"),
+            label: Some("Camera Buffer"),
             contents: bytemuck::cast_slice(&[data]),
             usage: wgpu::BufferUsage::COPY_DST | wgpu::BufferUsage::UNIFORM,
         });
@@ -121,7 +121,7 @@ impl CameraUniform {
 
     pub fn update_buffer(&self, device: &wgpu::Device, encoder: &mut wgpu::CommandEncoder) {
         let staging_buffer = device.create_buffer_init(&BufferInitDescriptor {
-            label: Some("Uniform Update Buffer"),
+            label: Some("Camera Update Buffer"),
             contents: bytemuck::cast_slice(&[self.data]),
             usage: wgpu::BufferUsage::COPY_SRC,
         });
@@ -157,7 +157,7 @@ impl UniformBinding {
                 },
                 count: None,
             }],
-            label: Some("UniformBinding::layout"),
+            label: Some("CameraBinding::layout"),
         });
         let bind_group = device.create_bind_group(&wgpu::BindGroupDescriptor {
             layout: &layout,
@@ -165,7 +165,7 @@ impl UniformBinding {
                 binding: 0,
                 resource: camera_uniform.buffer.as_entire_binding(),
             }],
-            label: Some("UniformBinding::bind_group"),
+            label: Some("CameraBinding::bind_group"),
         });
 
         Self { layout, bind_group }
@@ -178,7 +178,7 @@ impl UniformBinding {
                 binding: 0,
                 resource: camera_uniform.buffer.as_entire_binding(),
             }],
-            label: Some("UniformBinding::bind_group"),
+            label: Some("CameraBinding::bind_group"),
         });
     }
 }

docs/beginner/tutorial6-uniforms/README.md

@@ -124,7 +124,7 @@ camera_uniform.update_view_proj(&camera);
 
 let camera_buffer = device.create_buffer_init(
     &wgpu::util::BufferInitDescriptor {
-        label: Some("Uniform Buffer"),
+        label: Some("Camera Buffer"),
         contents: bytemuck::cast_slice(&[camera_uniform]),
         usage: wgpu::BufferUsage::UNIFORM | wgpu::BufferUsage::COPY_DST,
     }