Skip to content

Commit

Permalink
Backed out 2 changesets (bug 1716395, bug 1716317) for causing webren…
Browse files Browse the repository at this point in the history
…der bustages CLOSED TREE

Backed out changeset d0526849e7c3 (bug 1716317)
Backed out changeset 0693eb0f1e49 (bug 1716395)

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/ad4edb3c20fcc4c6f363250cc3e3efec9ffece3a
  • Loading branch information
nerli1 committed Jun 15, 2021
1 parent 41b7e3e commit 564cef8
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 284 deletions.
12 changes: 0 additions & 12 deletions webrender/src/internal_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,6 @@ pub struct TextureCacheAllocation {
pub kind: TextureCacheAllocationKind,
}

/// A little bit of extra information to make memory reports more useful
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "capture", derive(Serialize))]
#[cfg_attr(feature = "replay", derive(Deserialize))]
pub enum TextureCacheCategory {
Atlas,
Standalone,
PictureTile,
RenderTarget,
}

/// Information used when allocating / reallocating.
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
pub struct TextureCacheAllocInfo {
Expand All @@ -336,7 +325,6 @@ pub struct TextureCacheAllocInfo {
pub is_shared_cache: bool,
/// If true, this texture requires a depth target.
pub has_depth: bool,
pub category: TextureCacheCategory
}

/// Sub-operation-specific information for allocation operations.
Expand Down
Loading

0 comments on commit 564cef8

Please sign in to comment.