Auto merge of #395 - pcwalton:warnings, r=pcwalton

Fix warnings

Author: bors-servo

demo/common/src/lib.rs

@@ -45,7 +45,7 @@ use pathfinder_resources::ResourceLoader;
 use pathfinder_svg::SVGScene;
 use pathfinder_ui::{MousePosition, UIEvent};
 use std::fs::File;
-use std::io::{BufWriter, Read};
+use std::io::BufWriter;
 use std::path::PathBuf;
 use std::thread;
 use std::time::Duration;
@@ -578,7 +578,7 @@ impl<W> DemoApp<W> where W: Window {
             UIAction::EffectsChanged => {
                 let viewport_size = self.window.viewport(self.ui_model.mode.view(0)).size();
                 let filter = build_filter(&self.ui_model);
-                let (mut scene, message) = self.content.render(viewport_size, filter);
+                let (mut scene, _) = self.content.render(viewport_size, filter);
                 self.scene_metadata =
                     SceneMetadata::new_clipping_view_box(&mut scene, viewport_size);
                 self.scene_proxy.replace_scene(scene);

demo/common/src/renderer.rs

@@ -132,6 +132,7 @@ impl<W> DemoApp<W> where W: Window {
         self.renderer.device().begin_commands();
     }
 
+    #[allow(deprecated)]
     pub fn composite_scene(&mut self, render_scene_index: u32) {
         let (eye_transforms, scene_transform, modelview_transform) = match self.camera {
             Camera::ThreeD {
@@ -255,6 +256,7 @@ impl<W> DemoApp<W> where W: Window {
         });
     }
 
+    #[allow(deprecated)]
     fn render_vector_scene(&mut self) {
         if self.ui_model.mode == Mode::TwoD {
             self.renderer.disable_depth();

export/src/lib.rs

@@ -56,7 +56,6 @@ fn export_svg<W: Write>(scene: &Scene, writer: &mut W) -> io::Result<()> {
     for draw_path_index in 0..scene.draw_path_count() {
         let draw_path_id = DrawPathId(draw_path_index);
         let draw_path = scene.get_draw_path(draw_path_id);
-        let paint = scene.get_paint(draw_path.paint);
         write!(writer, "    <path")?;
         if !draw_path.name.is_empty() {
             write!(writer, " id=\"{}\"", draw_path.name)?;

renderer/src/builder.rs

@@ -174,7 +174,6 @@ impl<'a, 'b, 'c, 'd> SceneBuilder<'a, 'b, 'c, 'd> {
         let PaintInfo {
             render_commands,
             paint_metadata,
-            render_target_metadata: _,
         } = self.scene.build_paint_info(&mut self.sink.paint_texture_manager, render_transform);
         for render_command in render_commands {
             self.sink.listener.send(render_command);

renderer/src/gpu/shaders.rs

@@ -147,7 +147,6 @@ pub(crate) struct TileProgramCommon<D> where D: Device {
     pub(crate) z_buffer_texture_size_uniform: D::Uniform,
     pub(crate) color_texture_0: D::TextureParameter,
     pub(crate) color_texture_size_0_uniform: D::Uniform,
-    pub(crate) color_texture_1: D::TextureParameter,
     pub(crate) mask_texture_0: D::TextureParameter,
     pub(crate) mask_texture_size_0_uniform: D::Uniform,
     pub(crate) gamma_lut_texture: D::TextureParameter,
@@ -163,7 +162,6 @@ impl<D> TileProgramCommon<D> where D: Device {
         let z_buffer_texture_size_uniform = device.get_uniform(&program, "ZBufferSize");
         let color_texture_0 = device.get_texture_parameter(&program, "ColorTexture0");
         let color_texture_size_0_uniform = device.get_uniform(&program, "ColorTextureSize0");
-        let color_texture_1 = device.get_texture_parameter(&program, "ColorTexture1");
         let mask_texture_0 = device.get_texture_parameter(&program, "MaskTexture0");
         let mask_texture_size_0_uniform = device.get_uniform(&program, "MaskTextureSize0");
         let gamma_lut_texture = device.get_texture_parameter(&program, "GammaLUT");
@@ -178,7 +176,6 @@ impl<D> TileProgramCommon<D> where D: Device {
             z_buffer_texture_size_uniform,
             color_texture_0,
             color_texture_size_0_uniform,
-            color_texture_1,
             mask_texture_0,
             mask_texture_size_0_uniform,
             gamma_lut_texture,

renderer/src/gpu_data.rs

@@ -29,7 +29,6 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 use std::u32;
 
-pub const TILE_CTRL_MASK_MASK:     i32 = 0x3;
 pub const TILE_CTRL_MASK_WINDING:  i32 = 0x1;
 pub const TILE_CTRL_MASK_EVEN_ODD: i32 = 0x2;
 
@@ -437,13 +436,6 @@ impl PathBatchIndex {
     }
 }
 
-impl GlobalPathId {
-    #[inline]
-    pub fn none() -> GlobalPathId {
-        GlobalPathId { batch_id: TileBatchId(!0), path_index: PathBatchIndex(!0) }
-    }
-}
-
 impl AlphaTileId {
     #[inline]
     pub fn new(next_alpha_tile_index: &[AtomicUsize; ALPHA_TILE_LEVEL_COUNT], level: usize) 

renderer/src/paint.rs

@@ -317,10 +317,6 @@ pub(crate) struct PaintInfo {
     ///
     /// The indices of this vector are paint IDs.
     pub(crate) paint_metadata: Vec<PaintMetadata>,
-    /// The metadata for each render target.
-    ///
-    /// The indices of this vector are render target IDs.
-    pub(crate) render_target_metadata: Vec<RenderTargetMetadata>,
 }
 
 #[derive(Debug)]
@@ -426,15 +422,15 @@ impl Palette {
 
         // Create render commands.
         self.create_render_commands(&mut render_commands,
-                                    &render_target_metadata,
+                                    render_target_metadata,
                                     gradient_tile_builder,
                                     image_texel_info);
 
         // Free transient locations and unused images, now that they're no longer needed.
         self.free_transient_locations(texture_manager, transient_paint_locations);
         self.free_unused_images(texture_manager, used_image_hashes);
 
-        PaintInfo { render_commands, paint_metadata, render_target_metadata }
+        PaintInfo { render_commands, paint_metadata }
     }
 
     fn assign_render_target_locations(&self,
@@ -667,7 +663,7 @@ impl Palette {
 
     fn create_render_commands(&self,
                               render_commands: &mut Vec<RenderCommand>,
-                              render_target_metadata: &[RenderTargetMetadata],
+                              render_target_metadata: Vec<RenderTargetMetadata>,
                               gradient_tile_builder: GradientTileBuilder,
                               image_texel_info: Vec<ImageTexelInfo>) {
         for (index, metadata) in render_target_metadata.iter().enumerate() {