Skip to content

/ webrender

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump bitflags to 1.0 #1879

Merged
merged 1 commit into from Oct 16, 2017
+36 −31
Merged

Bump bitflags to 1.0 #1879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

10 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more.

2 servo-tidy.toml
View file
Open in desktop
@@ -4,7 +4,7 @@ skip-check-licenses = false

[ignore]
# Ignored packages with duplicated versions
packages = ["yaml-rust"]
packages = ["yaml-rust", "bitflags"]
# Files that are ignored for all tidy and lint checks.
files = [
# servo-tidy does not properly support workspaces yet.
2 webrender/Cargo.toml
View file
Open in desktop
@@ -25,7 +25,7 @@ num-traits = "0.1.32"
time = "0.1"
rayon = "0.8"
webrender_api = {path = "../webrender_api"}
bitflags = "0.9"
bitflags = "1.0"
thread_profiler = "0.1.1"
plane-split = "0.6"
ws = { optional = true, version = "0.7.3" }
8 webrender/examples/common/boilerplate.rs
View file
Open in desktop
@@ -187,7 +187,7 @@ pub fn main_wrapper(example: &mut Example, options: Option<webrender::RendererOp
Some(glutin::VirtualKeyCode::P),
) => {
let mut flags = renderer.get_debug_flags();
flags.toggle(webrender::PROFILER_DBG);
flags.toggle(webrender::DebugFlags::PROFILER_DBG);
renderer.set_debug_flags(flags);
}
glutin::Event::KeyboardInput(
@@ -196,7 +196,7 @@ pub fn main_wrapper(example: &mut Example, options: Option<webrender::RendererOp
Some(glutin::VirtualKeyCode::O),
) => {
let mut flags = renderer.get_debug_flags();
flags.toggle(webrender::RENDER_TARGET_DBG);
flags.toggle(webrender::DebugFlags::RENDER_TARGET_DBG);
renderer.set_debug_flags(flags);
}
glutin::Event::KeyboardInput(
@@ -205,7 +205,7 @@ pub fn main_wrapper(example: &mut Example, options: Option<webrender::RendererOp
Some(glutin::VirtualKeyCode::I),
) => {
let mut flags = renderer.get_debug_flags();
flags.toggle(webrender::TEXTURE_CACHE_DBG);
flags.toggle(webrender::DebugFlags::TEXTURE_CACHE_DBG);
renderer.set_debug_flags(flags);
}
glutin::Event::KeyboardInput(
@@ -214,7 +214,7 @@ pub fn main_wrapper(example: &mut Example, options: Option<webrender::RendererOp
Some(glutin::VirtualKeyCode::B),
) => {
let mut flags = renderer.get_debug_flags();
flags.toggle(webrender::ALPHA_PRIM_DBG);
flags.toggle(webrender::DebugFlags::ALPHA_PRIM_DBG);
renderer.set_debug_flags(flags);
}
glutin::Event::KeyboardInput(
8 webrender/src/frame_builder.rs
View file
Open in desktop
@@ -5,11 +5,11 @@
use api::{BorderDetails, BorderDisplayItem, BorderRadius, BoxShadowClipMode, BuiltDisplayList};
use api::{ClipAndScrollInfo, ClipId, ColorF};
use api::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DeviceUintRect, DeviceUintSize};
use api::{ExtendMode, FIND_ALL, FilterOp, FontInstance, FontRenderMode};
use api::{ExtendMode, FilterOp, FontInstance, FontRenderMode};
use api::{GlyphInstance, GlyphOptions, GradientStop, HitTestFlags, HitTestItem, HitTestResult};
use api::{ImageKey, ImageRendering, ItemRange, ItemTag, LayerPoint, LayerPrimitiveInfo, LayerRect};
use api::{LayerPixel, LayerSize, LayerToScrollTransform, LayerVector2D, LayoutVector2D, LineOrientation};
use api::{LineStyle, LocalClip, POINT_RELATIVE_TO_PIPELINE_VIEWPORT, PipelineId, RepeatMode};
use api::{LineStyle, LocalClip, PipelineId, RepeatMode};
use api::{ScrollSensitivity, Shadow, TileOffset, TransformStyle};
use api::{WorldPixel, WorldPoint, YuvColorSpace, YuvData, device_length};
use app_units::Au;
@@ -1575,7 +1575,7 @@ impl FrameBuilder {
point: WorldPoint,
flags: HitTestFlags
) -> HitTestResult {
let point = if flags.contains(POINT_RELATIVE_TO_PIPELINE_VIEWPORT) {
let point = if flags.contains(HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT) {
let point = LayerPoint::new(point.x, point.y);
clip_scroll_tree.make_node_relative_point_absolute(pipeline_id, &point)
} else {
@@ -1626,7 +1626,7 @@ impl FrameBuilder {
tag: item.tag,
point_in_viewport,
});
if !flags.contains(FIND_ALL) {
if !flags.contains(HitTestFlags::FIND_ALL) {
return result;
}
}
1 webrender/src/lib.rs
View file
Open in desktop
@@ -150,7 +150,6 @@ extern crate gamma_lut;

#[doc(hidden)]
pub use device::build_shader_strings;
pub use renderer::{ALPHA_PRIM_DBG, PROFILER_DBG, RENDER_TARGET_DBG, TEXTURE_CACHE_DBG};
pub use renderer::{CpuProfile, DebugFlags, GpuProfile, OutputImageHandler, RendererKind};
pub use renderer::{ExternalImage, ExternalImageHandler, ExternalImageSource};
pub use renderer::{GraphicsApi, GraphicsApiInfo, ReadPixelsFormat, Renderer, RendererOptions};
26 webrender/src/renderer.rs
View file
Open in desktop
@@ -2011,24 +2011,24 @@ impl Renderer {
fn handle_debug_command(&mut self, command: DebugCommand) {
match command {
DebugCommand::EnableProfiler(enable) => if enable {
self.debug_flags.insert(PROFILER_DBG);
self.debug_flags.insert(DebugFlags::PROFILER_DBG);
} else {
self.debug_flags.remove(PROFILER_DBG);
self.debug_flags.remove(DebugFlags::PROFILER_DBG);
},
DebugCommand::EnableTextureCacheDebug(enable) => if enable {
self.debug_flags.insert(TEXTURE_CACHE_DBG);
self.debug_flags.insert(DebugFlags::TEXTURE_CACHE_DBG);
} else {
self.debug_flags.remove(TEXTURE_CACHE_DBG);
self.debug_flags.remove(DebugFlags::TEXTURE_CACHE_DBG);
},
DebugCommand::EnableRenderTargetDebug(enable) => if enable {
self.debug_flags.insert(RENDER_TARGET_DBG);
self.debug_flags.insert(DebugFlags::RENDER_TARGET_DBG);
} else {
self.debug_flags.remove(RENDER_TARGET_DBG);
self.debug_flags.remove(DebugFlags::RENDER_TARGET_DBG);
},
DebugCommand::EnableAlphaRectsDebug(enable) => if enable {
self.debug_flags.insert(ALPHA_PRIM_DBG);
self.debug_flags.insert(DebugFlags::ALPHA_PRIM_DBG);
} else {
self.debug_flags.remove(ALPHA_PRIM_DBG);
self.debug_flags.remove(DebugFlags::ALPHA_PRIM_DBG);
},
DebugCommand::FetchDocuments => {}
DebugCommand::FetchClipScrollTree => {}
@@ -2133,7 +2133,7 @@ impl Renderer {
self.cpu_profiles.push_back(cpu_profile);
}

if self.debug_flags.contains(PROFILER_DBG) {
if self.debug_flags.contains(DebugFlags::PROFILER_DBG) {
let screen_fraction = 1.0 / //TODO: take device/pixel ratio into equation?
(framebuffer_size.width as f32 * framebuffer_size.height as f32);
self.profiler.draw_profile(
@@ -2734,7 +2734,7 @@ impl Renderer {
self.gpu_profile.add_sampler(GPU_SAMPLER_TAG_TRANSPARENT);

for batch in &target.alpha_batcher.batch_list.alpha_batch_list.batches {
if self.debug_flags.contains(ALPHA_PRIM_DBG) {
if self.debug_flags.contains(DebugFlags::ALPHA_PRIM_DBG) {
let color = match batch.key.blend_mode {
BlendMode::None => ColorF::new(0.3, 0.3, 0.3, 1.0),
BlendMode::Alpha => ColorF::new(0.0, 0.9, 0.1, 1.0),
@@ -3330,7 +3330,7 @@ impl Renderer {
}

fn draw_render_target_debug(&mut self, framebuffer_size: DeviceUintSize) {
if !self.debug_flags.contains(RENDER_TARGET_DBG) {
if !self.debug_flags.contains(DebugFlags::RENDER_TARGET_DBG) {
return;
}

@@ -3370,7 +3370,7 @@ impl Renderer {
}

fn draw_texture_cache_debug(&mut self, framebuffer_size: DeviceUintSize) {
if !self.debug_flags.contains(TEXTURE_CACHE_DBG) {
if !self.debug_flags.contains(DebugFlags::TEXTURE_CACHE_DBG) {
return;
}

@@ -3391,7 +3391,7 @@ impl Renderer {

let mut i = 0;
for texture in &self.texture_resolver.cache_texture_map {
let y = spacing + if self.debug_flags.contains(RENDER_TARGET_DBG) {
let y = spacing + if self.debug_flags.contains(DebugFlags::RENDER_TARGET_DBG) {
528
} else {
0
2 webrender_api/Cargo.toml
View file
Open in desktop
@@ -11,8 +11,8 @@ ipc = ["ipc-channel"]

[dependencies]
app_units = "0.5.6"
bitflags = "1.0"
bincode = "0.9"
bitflags = "0.9"
byteorder = "1.0"
euclid = "0.15"
heapsize = ">= 0.3.6, < 0.5"
8 wrench/src/main.rs
View file
Open in desktop
@@ -546,22 +546,22 @@ fn main() {
}
VirtualKeyCode::P => {
let mut flags = wrench.renderer.get_debug_flags();
flags.toggle(webrender::PROFILER_DBG);
flags.toggle(webrender::DebugFlags::PROFILER_DBG);
wrench.renderer.set_debug_flags(flags);
}
VirtualKeyCode::O => {
let mut flags = wrench.renderer.get_debug_flags();
flags.toggle(webrender::RENDER_TARGET_DBG);
flags.toggle(webrender::DebugFlags::RENDER_TARGET_DBG);
wrench.renderer.set_debug_flags(flags);
}
VirtualKeyCode::I => {
let mut flags = wrench.renderer.get_debug_flags();
flags.toggle(webrender::TEXTURE_CACHE_DBG);
flags.toggle(webrender::DebugFlags::TEXTURE_CACHE_DBG);
wrench.renderer.set_debug_flags(flags);
}
VirtualKeyCode::B => {
let mut flags = wrench.renderer.get_debug_flags();
flags.toggle(webrender::ALPHA_PRIM_DBG);
flags.toggle(webrender::DebugFlags::ALPHA_PRIM_DBG);
wrench.renderer.set_debug_flags(flags);
}
VirtualKeyCode::M => {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.