Remove use of webrender::RendererKind

It appears to be unused since 2017 with https://github.com/servo/webrender/pull/1587
CC https://bugzilla.mozilla.org/show_bug.cgi?id=1631579
This commit is contained in:
Simon Sapin 2020-04-20 22:05:59 +02:00
parent 4c8413d532
commit bbed751bbc
2 changed files with 1 additions and 14 deletions

View file

@ -1009,9 +1009,3 @@ pub fn parse_url_or_filename(cwd: &Path, input: &str) -> Result<ServoUrl, ()> {
Err(_) => Err(()), Err(_) => Err(()),
} }
} }
impl Opts {
pub fn should_use_osmesa(&self) -> bool {
self.headless
}
}

View file

@ -118,7 +118,7 @@ use std::rc::Rc;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use surfman::GLApi; use surfman::GLApi;
use webrender::{RendererKind, ShaderPrecacheFlags}; use webrender::ShaderPrecacheFlags;
use webrender_surfman::WebrenderSurfman; use webrender_surfman::WebrenderSurfman;
use webrender_traits::WebrenderImageHandlerType; use webrender_traits::WebrenderImageHandlerType;
use webrender_traits::{WebrenderExternalImageHandlers, WebrenderExternalImageRegistry}; use webrender_traits::{WebrenderExternalImageHandlers, WebrenderExternalImageRegistry};
@ -400,12 +400,6 @@ where
let viewport_size = coordinates.viewport.size.to_f32() / device_pixel_ratio; let viewport_size = coordinates.viewport.size.to_f32() / device_pixel_ratio;
let (mut webrender, webrender_api_sender) = { 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 recorder = if opts.webrender_record {
let record_path = PathBuf::from("wr-record.bin"); let record_path = PathBuf::from("wr-record.bin");
let recorder = Box::new(webrender::BinaryRecorder::new(&record_path)); let recorder = Box::new(webrender::BinaryRecorder::new(&record_path));
@ -436,7 +430,6 @@ where
} else { } else {
ShaderPrecacheFlags::empty() ShaderPrecacheFlags::empty()
}, },
renderer_kind: renderer_kind,
enable_subpixel_aa: opts.enable_subpixel_text_antialiasing, enable_subpixel_aa: opts.enable_subpixel_text_antialiasing,
allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled), allow_texture_swizzling: pref!(gfx.texture_swizzling.enabled),
clear_color: None, clear_color: None,