Skip to content

Commit

Permalink
Remove use of webrender::RendererKind
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Apr 20, 2020
1 parent 4c8413d commit bbed751
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
6 changes: 0 additions & 6 deletions components/config/opts.rs
Expand Up @@ -1009,9 +1009,3 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
Err(_) => Err(()),
}
}

impl Opts {
pub fn should_use_osmesa(&self) -> bool {
self.headless
}
}
9 changes: 1 addition & 8 deletions components/servo/lib.rs
Expand Up @@ -118,7 +118,7 @@ use std::rc::Rc;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex};
use surfman::GLApi;
use webrender::{RendererKind, ShaderPrecacheFlags};
use webrender::ShaderPrecacheFlags;
use webrender_surfman::WebrenderSurfman;
use webrender_traits::WebrenderImageHandlerType;
use webrender_traits::{WebrenderExternalImageHandlers, WebrenderExternalImageRegistry};
Expand Down Expand Up @@ -400,12 +400,6 @@ where
let viewport_size = coordinates.viewport.size.to_f32() / device_pixel_ratio;

let (mut webrender, webrender_api_sender) = {
let renderer_kind = if opts::get().should_use_osmesa() {
RendererKind::OSMesa
} else {
RendererKind::Native
};

let recorder = if opts.webrender_record {
let record_path = PathBuf::from("wr-record.bin");
let recorder = Box::new(webrender::BinaryRecorder::new(&record_path));
Expand Down Expand Up @@ -436,7 +430,6 @@ where
} else {
ShaderPrecacheFlags::empty()
},
renderer_kind: renderer_kind,
enable_subpixel_aa: opts.enable_subpixel_text_antialiasing,
allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled),
clear_color: None,
Expand Down

0 comments on commit bbed751

Please sign in to comment.