Move `RenderTargetId` out of the `pattern` module
This commit is contained in:
parent
2beb2bb126
commit
d0f4579864
|
@ -16,7 +16,8 @@ use pathfinder_content::effects::{BlendMode, BlurDirection, CompositeOp, Effects
|
||||||
use pathfinder_content::fill::FillRule;
|
use pathfinder_content::fill::FillRule;
|
||||||
use pathfinder_content::gradient::Gradient;
|
use pathfinder_content::gradient::Gradient;
|
||||||
use pathfinder_content::outline::{ArcDirection, Contour, Outline};
|
use pathfinder_content::outline::{ArcDirection, Contour, Outline};
|
||||||
use pathfinder_content::pattern::{Pattern, PatternFlags, RenderTargetId};
|
use pathfinder_content::pattern::{Pattern, PatternFlags};
|
||||||
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_content::stroke::{LineCap, LineJoin as StrokeLineJoin};
|
use pathfinder_content::stroke::{LineCap, LineJoin as StrokeLineJoin};
|
||||||
use pathfinder_content::stroke::{OutlineStrokeToFill, StrokeStyle};
|
use pathfinder_content::stroke::{OutlineStrokeToFill, StrokeStyle};
|
||||||
use pathfinder_geometry::line_segment::LineSegment2F;
|
use pathfinder_geometry::line_segment::LineSegment2F;
|
||||||
|
|
|
@ -25,6 +25,7 @@ pub mod gradient;
|
||||||
pub mod orientation;
|
pub mod orientation;
|
||||||
pub mod outline;
|
pub mod outline;
|
||||||
pub mod pattern;
|
pub mod pattern;
|
||||||
|
pub mod render_target;
|
||||||
pub mod segment;
|
pub mod segment;
|
||||||
pub mod sorted_vector;
|
pub mod sorted_vector;
|
||||||
pub mod stroke;
|
pub mod stroke;
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
//! Raster image patterns.
|
//! Raster image patterns.
|
||||||
|
|
||||||
|
use crate::render_target::RenderTargetId;
|
||||||
use pathfinder_color::{self as color, ColorU};
|
use pathfinder_color::{self as color, ColorU};
|
||||||
use pathfinder_geometry::vector::Vector2I;
|
use pathfinder_geometry::vector::Vector2I;
|
||||||
use std::fmt::{self, Debug, Formatter};
|
use std::fmt::{self, Debug, Formatter};
|
||||||
|
@ -30,9 +31,6 @@ pub enum PatternSource {
|
||||||
RenderTarget(RenderTargetId),
|
RenderTarget(RenderTargetId),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
|
|
||||||
pub struct RenderTargetId(pub u32);
|
|
||||||
|
|
||||||
/// RGBA, non-premultiplied.
|
/// RGBA, non-premultiplied.
|
||||||
// FIXME(pcwalton): Hash the pixel contents so that we don't have to compare every pixel!
|
// FIXME(pcwalton): Hash the pixel contents so that we don't have to compare every pixel!
|
||||||
// TODO(pcwalton): Should the pixels be premultiplied?
|
// TODO(pcwalton): Should the pixels be premultiplied?
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
// pathfinder/content/src/render_target.rs
|
||||||
|
//
|
||||||
|
// Copyright © 2020 The Pathfinder Project Developers.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
//! Render targets.
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
|
||||||
|
pub struct RenderTargetId(pub u32);
|
|
@ -11,7 +11,7 @@
|
||||||
//! A simple quadtree-based texture allocator.
|
//! A simple quadtree-based texture allocator.
|
||||||
|
|
||||||
use crate::gpu_data::PaintPageId;
|
use crate::gpu_data::PaintPageId;
|
||||||
use pathfinder_content::pattern::RenderTargetId;
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::rect::RectI;
|
use pathfinder_geometry::rect::RectI;
|
||||||
use pathfinder_geometry::vector::{Vector2F, Vector2I};
|
use pathfinder_geometry::vector::{Vector2F, Vector2I};
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ use crate::tiles::{self, DrawTilingPathInfo, TILE_HEIGHT, TILE_WIDTH, Tiler, Til
|
||||||
use crate::z_buffer::{DepthMetadata, ZBuffer};
|
use crate::z_buffer::{DepthMetadata, ZBuffer};
|
||||||
use pathfinder_content::effects::BlendMode;
|
use pathfinder_content::effects::BlendMode;
|
||||||
use pathfinder_content::fill::FillRule;
|
use pathfinder_content::fill::FillRule;
|
||||||
use pathfinder_content::pattern::RenderTargetId;
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::line_segment::{LineSegment2F, LineSegmentU4, LineSegmentU8};
|
use pathfinder_geometry::line_segment::{LineSegment2F, LineSegmentU4, LineSegmentU8};
|
||||||
use pathfinder_geometry::rect::{RectF, RectI};
|
use pathfinder_geometry::rect::{RectF, RectI};
|
||||||
use pathfinder_geometry::util;
|
use pathfinder_geometry::util;
|
||||||
|
|
|
@ -12,12 +12,13 @@ use crate::gpu::debug::DebugUIPresenter;
|
||||||
use crate::gpu::options::{DestFramebuffer, RendererOptions};
|
use crate::gpu::options::{DestFramebuffer, RendererOptions};
|
||||||
use crate::gpu::shaders::{AlphaTileBlendModeProgram, AlphaTileDodgeBurnProgram};
|
use crate::gpu::shaders::{AlphaTileBlendModeProgram, AlphaTileDodgeBurnProgram};
|
||||||
use crate::gpu::shaders::{AlphaTileHSLProgram, AlphaTileOverlayProgram};
|
use crate::gpu::shaders::{AlphaTileHSLProgram, AlphaTileOverlayProgram};
|
||||||
use crate::gpu::shaders::{AlphaTileProgram, AlphaTileVertexArray, BlitProgram, BlitVertexArray, CopyTileProgram};
|
use crate::gpu::shaders::{AlphaTileProgram, AlphaTileVertexArray, BlitProgram, BlitVertexArray};
|
||||||
use crate::gpu::shaders::{CopyTileVertexArray, FillProgram, FillVertexArray};
|
use crate::gpu::shaders::{CopyTileProgram, CopyTileVertexArray, FillProgram, FillVertexArray};
|
||||||
use crate::gpu::shaders::{MAX_FILLS_PER_BATCH};
|
use crate::gpu::shaders::{MAX_FILLS_PER_BATCH, MaskTileProgram, MaskTileVertexArray};
|
||||||
use crate::gpu::shaders::{MaskTileProgram, MaskTileVertexArray, ReprojectionProgram};
|
use crate::gpu::shaders::{ReprojectionProgram, ReprojectionVertexArray, SolidTileProgram};
|
||||||
use crate::gpu::shaders::{ReprojectionVertexArray, SolidTileProgram, SolidTileVertexArray};
|
use crate::gpu::shaders::{SolidTileVertexArray, StencilProgram, StencilVertexArray};
|
||||||
use crate::gpu::shaders::{StencilProgram, StencilVertexArray, TileFilterBasicProgram, TileFilterBlurProgram, TileFilterProgram, TileFilterTextProgram, TileFilterVertexArray};
|
use crate::gpu::shaders::{TileFilterBasicProgram, TileFilterBlurProgram, TileFilterProgram};
|
||||||
|
use crate::gpu::shaders::{TileFilterTextProgram, TileFilterVertexArray};
|
||||||
use crate::gpu_data::{AlphaTile, FillBatchPrimitive, MaskTile, PaintData, PaintPageContents};
|
use crate::gpu_data::{AlphaTile, FillBatchPrimitive, MaskTile, PaintData, PaintPageContents};
|
||||||
use crate::gpu_data::{PaintPageId, RenderCommand, RenderTargetTile, SolidTileVertex};
|
use crate::gpu_data::{PaintPageId, RenderCommand, RenderTargetTile, SolidTileVertex};
|
||||||
use crate::options::BoundingQuad;
|
use crate::options::BoundingQuad;
|
||||||
|
@ -26,7 +27,7 @@ use pathfinder_color::{self as color, ColorF};
|
||||||
use pathfinder_content::effects::{BlendMode, BlurDirection, CompositeOp, DefringingKernel};
|
use pathfinder_content::effects::{BlendMode, BlurDirection, CompositeOp, DefringingKernel};
|
||||||
use pathfinder_content::effects::{Effects, Filter};
|
use pathfinder_content::effects::{Effects, Filter};
|
||||||
use pathfinder_content::fill::FillRule;
|
use pathfinder_content::fill::FillRule;
|
||||||
use pathfinder_content::pattern::RenderTargetId;
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::vector::{Vector2F, Vector2I, Vector4F};
|
use pathfinder_geometry::vector::{Vector2F, Vector2I, Vector4F};
|
||||||
use pathfinder_geometry::rect::RectI;
|
use pathfinder_geometry::rect::RectI;
|
||||||
use pathfinder_geometry::transform3d::Transform4F;
|
use pathfinder_geometry::transform3d::Transform4F;
|
||||||
|
|
|
@ -14,7 +14,7 @@ use crate::options::BoundingQuad;
|
||||||
use pathfinder_color::ColorU;
|
use pathfinder_color::ColorU;
|
||||||
use pathfinder_content::effects::{BlendMode, Effects};
|
use pathfinder_content::effects::{BlendMode, Effects};
|
||||||
use pathfinder_content::fill::FillRule;
|
use pathfinder_content::fill::FillRule;
|
||||||
use pathfinder_content::pattern::RenderTargetId;
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::line_segment::{LineSegmentU4, LineSegmentU8};
|
use pathfinder_geometry::line_segment::{LineSegmentU4, LineSegmentU8};
|
||||||
use pathfinder_geometry::vector::Vector2I;
|
use pathfinder_geometry::vector::Vector2I;
|
||||||
use pathfinder_gpu::TextureSamplingFlags;
|
use pathfinder_gpu::TextureSamplingFlags;
|
||||||
|
|
|
@ -15,7 +15,8 @@ use crate::tiles::{TILE_HEIGHT, TILE_WIDTH};
|
||||||
use hashbrown::HashMap;
|
use hashbrown::HashMap;
|
||||||
use pathfinder_color::ColorU;
|
use pathfinder_color::ColorU;
|
||||||
use pathfinder_content::gradient::{Gradient, GradientGeometry};
|
use pathfinder_content::gradient::{Gradient, GradientGeometry};
|
||||||
use pathfinder_content::pattern::{Image, Pattern, PatternFlags, PatternSource, RenderTargetId};
|
use pathfinder_content::pattern::{Image, Pattern, PatternFlags, PatternSource};
|
||||||
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::rect::{RectF, RectI};
|
use pathfinder_geometry::rect::{RectF, RectI};
|
||||||
use pathfinder_geometry::transform2d::{Matrix2x2F, Transform2F};
|
use pathfinder_geometry::transform2d::{Matrix2x2F, Transform2F};
|
||||||
use pathfinder_geometry::util;
|
use pathfinder_geometry::util;
|
||||||
|
|
|
@ -18,7 +18,7 @@ use crate::paint::{Paint, PaintId, PaintInfo, Palette};
|
||||||
use pathfinder_content::effects::{BlendMode, Effects};
|
use pathfinder_content::effects::{BlendMode, Effects};
|
||||||
use pathfinder_content::fill::FillRule;
|
use pathfinder_content::fill::FillRule;
|
||||||
use pathfinder_content::outline::Outline;
|
use pathfinder_content::outline::Outline;
|
||||||
use pathfinder_content::pattern::RenderTargetId;
|
use pathfinder_content::render_target::RenderTargetId;
|
||||||
use pathfinder_geometry::vector::{Vector2F, Vector2I};
|
use pathfinder_geometry::vector::{Vector2F, Vector2I};
|
||||||
use pathfinder_geometry::rect::RectF;
|
use pathfinder_geometry::rect::RectF;
|
||||||
use pathfinder_geometry::transform2d::Transform2F;
|
use pathfinder_geometry::transform2d::Transform2F;
|
||||||
|
|
Loading…
Reference in New Issue