commit
36c347afef
|
@ -45,7 +45,7 @@ use pathfinder_resources::ResourceLoader;
|
||||||
use pathfinder_svg::SVGScene;
|
use pathfinder_svg::SVGScene;
|
||||||
use pathfinder_ui::{MousePosition, UIEvent};
|
use pathfinder_ui::{MousePosition, UIEvent};
|
||||||
use std::fs::File;
|
use std::fs::File;
|
||||||
use std::io::{BufWriter, Read};
|
use std::io::BufWriter;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
@ -578,7 +578,7 @@ impl<W> DemoApp<W> where W: Window {
|
||||||
UIAction::EffectsChanged => {
|
UIAction::EffectsChanged => {
|
||||||
let viewport_size = self.window.viewport(self.ui_model.mode.view(0)).size();
|
let viewport_size = self.window.viewport(self.ui_model.mode.view(0)).size();
|
||||||
let filter = build_filter(&self.ui_model);
|
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 =
|
self.scene_metadata =
|
||||||
SceneMetadata::new_clipping_view_box(&mut scene, viewport_size);
|
SceneMetadata::new_clipping_view_box(&mut scene, viewport_size);
|
||||||
self.scene_proxy.replace_scene(scene);
|
self.scene_proxy.replace_scene(scene);
|
||||||
|
|
|
@ -132,6 +132,7 @@ impl<W> DemoApp<W> where W: Window {
|
||||||
self.renderer.device().begin_commands();
|
self.renderer.device().begin_commands();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(deprecated)]
|
||||||
pub fn composite_scene(&mut self, render_scene_index: u32) {
|
pub fn composite_scene(&mut self, render_scene_index: u32) {
|
||||||
let (eye_transforms, scene_transform, modelview_transform) = match self.camera {
|
let (eye_transforms, scene_transform, modelview_transform) = match self.camera {
|
||||||
Camera::ThreeD {
|
Camera::ThreeD {
|
||||||
|
@ -255,6 +256,7 @@ impl<W> DemoApp<W> where W: Window {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(deprecated)]
|
||||||
fn render_vector_scene(&mut self) {
|
fn render_vector_scene(&mut self) {
|
||||||
if self.ui_model.mode == Mode::TwoD {
|
if self.ui_model.mode == Mode::TwoD {
|
||||||
self.renderer.disable_depth();
|
self.renderer.disable_depth();
|
||||||
|
|
|
@ -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() {
|
for draw_path_index in 0..scene.draw_path_count() {
|
||||||
let draw_path_id = DrawPathId(draw_path_index);
|
let draw_path_id = DrawPathId(draw_path_index);
|
||||||
let draw_path = scene.get_draw_path(draw_path_id);
|
let draw_path = scene.get_draw_path(draw_path_id);
|
||||||
let paint = scene.get_paint(draw_path.paint);
|
|
||||||
write!(writer, " <path")?;
|
write!(writer, " <path")?;
|
||||||
if !draw_path.name.is_empty() {
|
if !draw_path.name.is_empty() {
|
||||||
write!(writer, " id=\"{}\"", draw_path.name)?;
|
write!(writer, " id=\"{}\"", draw_path.name)?;
|
||||||
|
|
|
@ -174,7 +174,6 @@ impl<'a, 'b, 'c, 'd> SceneBuilder<'a, 'b, 'c, 'd> {
|
||||||
let PaintInfo {
|
let PaintInfo {
|
||||||
render_commands,
|
render_commands,
|
||||||
paint_metadata,
|
paint_metadata,
|
||||||
render_target_metadata: _,
|
|
||||||
} = self.scene.build_paint_info(&mut self.sink.paint_texture_manager, render_transform);
|
} = self.scene.build_paint_info(&mut self.sink.paint_texture_manager, render_transform);
|
||||||
for render_command in render_commands {
|
for render_command in render_commands {
|
||||||
self.sink.listener.send(render_command);
|
self.sink.listener.send(render_command);
|
||||||
|
|
|
@ -147,7 +147,6 @@ pub(crate) struct TileProgramCommon<D> where D: Device {
|
||||||
pub(crate) z_buffer_texture_size_uniform: D::Uniform,
|
pub(crate) z_buffer_texture_size_uniform: D::Uniform,
|
||||||
pub(crate) color_texture_0: D::TextureParameter,
|
pub(crate) color_texture_0: D::TextureParameter,
|
||||||
pub(crate) color_texture_size_0_uniform: D::Uniform,
|
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_0: D::TextureParameter,
|
||||||
pub(crate) mask_texture_size_0_uniform: D::Uniform,
|
pub(crate) mask_texture_size_0_uniform: D::Uniform,
|
||||||
pub(crate) gamma_lut_texture: D::TextureParameter,
|
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 z_buffer_texture_size_uniform = device.get_uniform(&program, "ZBufferSize");
|
||||||
let color_texture_0 = device.get_texture_parameter(&program, "ColorTexture0");
|
let color_texture_0 = device.get_texture_parameter(&program, "ColorTexture0");
|
||||||
let color_texture_size_0_uniform = device.get_uniform(&program, "ColorTextureSize0");
|
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_0 = device.get_texture_parameter(&program, "MaskTexture0");
|
||||||
let mask_texture_size_0_uniform = device.get_uniform(&program, "MaskTextureSize0");
|
let mask_texture_size_0_uniform = device.get_uniform(&program, "MaskTextureSize0");
|
||||||
let gamma_lut_texture = device.get_texture_parameter(&program, "GammaLUT");
|
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,
|
z_buffer_texture_size_uniform,
|
||||||
color_texture_0,
|
color_texture_0,
|
||||||
color_texture_size_0_uniform,
|
color_texture_size_0_uniform,
|
||||||
color_texture_1,
|
|
||||||
mask_texture_0,
|
mask_texture_0,
|
||||||
mask_texture_size_0_uniform,
|
mask_texture_size_0_uniform,
|
||||||
gamma_lut_texture,
|
gamma_lut_texture,
|
||||||
|
|
|
@ -29,7 +29,6 @@ use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use std::u32;
|
use std::u32;
|
||||||
|
|
||||||
pub const TILE_CTRL_MASK_MASK: i32 = 0x3;
|
|
||||||
pub const TILE_CTRL_MASK_WINDING: i32 = 0x1;
|
pub const TILE_CTRL_MASK_WINDING: i32 = 0x1;
|
||||||
pub const TILE_CTRL_MASK_EVEN_ODD: i32 = 0x2;
|
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 {
|
impl AlphaTileId {
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn new(next_alpha_tile_index: &[AtomicUsize; ALPHA_TILE_LEVEL_COUNT], level: usize)
|
pub fn new(next_alpha_tile_index: &[AtomicUsize; ALPHA_TILE_LEVEL_COUNT], level: usize)
|
||||||
|
|
|
@ -317,10 +317,6 @@ pub(crate) struct PaintInfo {
|
||||||
///
|
///
|
||||||
/// The indices of this vector are paint IDs.
|
/// The indices of this vector are paint IDs.
|
||||||
pub(crate) paint_metadata: Vec<PaintMetadata>,
|
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)]
|
#[derive(Debug)]
|
||||||
|
@ -426,7 +422,7 @@ impl Palette {
|
||||||
|
|
||||||
// Create render commands.
|
// Create render commands.
|
||||||
self.create_render_commands(&mut render_commands,
|
self.create_render_commands(&mut render_commands,
|
||||||
&render_target_metadata,
|
render_target_metadata,
|
||||||
gradient_tile_builder,
|
gradient_tile_builder,
|
||||||
image_texel_info);
|
image_texel_info);
|
||||||
|
|
||||||
|
@ -434,7 +430,7 @@ impl Palette {
|
||||||
self.free_transient_locations(texture_manager, transient_paint_locations);
|
self.free_transient_locations(texture_manager, transient_paint_locations);
|
||||||
self.free_unused_images(texture_manager, used_image_hashes);
|
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,
|
fn assign_render_target_locations(&self,
|
||||||
|
@ -667,7 +663,7 @@ impl Palette {
|
||||||
|
|
||||||
fn create_render_commands(&self,
|
fn create_render_commands(&self,
|
||||||
render_commands: &mut Vec<RenderCommand>,
|
render_commands: &mut Vec<RenderCommand>,
|
||||||
render_target_metadata: &[RenderTargetMetadata],
|
render_target_metadata: Vec<RenderTargetMetadata>,
|
||||||
gradient_tile_builder: GradientTileBuilder,
|
gradient_tile_builder: GradientTileBuilder,
|
||||||
image_texel_info: Vec<ImageTexelInfo>) {
|
image_texel_info: Vec<ImageTexelInfo>) {
|
||||||
for (index, metadata) in render_target_metadata.iter().enumerate() {
|
for (index, metadata) in render_target_metadata.iter().enumerate() {
|
||||||
|
|
Loading…
Reference in New Issue