servoshell: Remove duplicate egl bindings on android/ohos (#34716)

- The default value for SwapInterval is 1,
  so setting it to 1 changes nothing
- We don't clear the screen immediately anymore, which was the only
  useage of the egl bindings

this saves us from duplicated EGL bindings.

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2024-12-20 16:08:09 +01:00 committed by GitHub
parent 65c65c9a6a
commit 0dd8798148
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 6 additions and 110 deletions

View file

@ -22,7 +22,7 @@ use servo::servo_config::{opts, pref};
use servo::servo_url::ServoUrl;
pub use servo::webrender_api::units::DeviceIntRect;
use servo::webrender_traits::RenderingContext;
use servo::{self, gl, Servo};
use servo::{self, Servo};
use surfman::{Connection, SurfaceType};
use crate::egl::android::resources::ResourceReaderInstance;
@ -56,7 +56,6 @@ pub enum SurfmanIntegration {
/// In the future, this will be done in multiple steps.
pub fn init(
mut init_opts: InitOptions,
gl: Rc<dyn gl::Gl>,
waker: Box<dyn EventLoopWaker>,
callbacks: Box<dyn HostTrait>,
) -> Result<(), &'static str> {
@ -78,10 +77,6 @@ pub fn init(
let url = embedder_url.or(pref_url).or(blank_url).unwrap();
gl.clear_color(1.0, 1.0, 1.0, 1.0);
gl.clear(gl::COLOR_BUFFER_BIT);
gl.finish();
// Initialize surfman
let connection = Connection::new().or(Err("Failed to create connection"))?;
let adapter = connection
@ -112,7 +107,6 @@ pub fn init(
waker,
#[cfg(feature = "webxr")]
init_opts.xr_discovery,
gl.clone(),
));
let servo = Servo::new(