mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Rename gleam feature to gl in compositing
This commit is contained in:
parent
87c849c0d6
commit
faee0b2b0c
5 changed files with 15 additions and 14 deletions
|
@ -13,6 +13,7 @@ path = "lib.rs"
|
|||
|
||||
[features]
|
||||
default = []
|
||||
gl = ["gleam"]
|
||||
|
||||
[dependencies]
|
||||
crossbeam-channel = "0.3"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
use crate::compositor_thread::{CompositorProxy, CompositorReceiver};
|
||||
use crate::compositor_thread::{InitialCompositorState, Msg};
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
use crate::gl;
|
||||
use crate::touch::{TouchAction, TouchHandler};
|
||||
use crate::windowing::{
|
||||
|
@ -15,13 +15,13 @@ use crate::SendableFrameTree;
|
|||
use crossbeam_channel::Sender;
|
||||
use euclid::{TypedPoint2D, TypedScale, TypedVector2D};
|
||||
use gfx_traits::Epoch;
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
use image::{DynamicImage, ImageFormat};
|
||||
use ipc_channel::ipc;
|
||||
use libc::c_void;
|
||||
use msg::constellation_msg::{PipelineId, PipelineIndex, PipelineNamespaceId};
|
||||
use net_traits::image::base::Image;
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
use net_traits::image::base::PixelFormat;
|
||||
use profile_traits::time::{self as profile_time, profile, ProfilerCategory};
|
||||
use script_traits::CompositorEvent::{MouseButtonEvent, MouseMoveEvent, TouchEvent};
|
||||
|
@ -1211,13 +1211,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
}
|
||||
|
||||
let rt_info = match target {
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
CompositeTarget::Window => gl::RenderTargetInfo::default(),
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
CompositeTarget::WindowAndPng | CompositeTarget::PngFile => {
|
||||
gl::initialize_png(&*self.window.gl(), width, height)
|
||||
},
|
||||
#[cfg(not(feature = "gleam"))]
|
||||
#[cfg(not(feature = "gl"))]
|
||||
_ => (),
|
||||
};
|
||||
|
||||
|
@ -1272,7 +1272,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
|
||||
let rv = match target {
|
||||
CompositeTarget::Window => None,
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
CompositeTarget::WindowAndPng => {
|
||||
let img = gl::draw_img(&*self.window.gl(), rt_info, width, height);
|
||||
Some(Image {
|
||||
|
@ -1283,7 +1283,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
id: None,
|
||||
})
|
||||
},
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
CompositeTarget::PngFile => {
|
||||
let gl = &*self.window.gl();
|
||||
profile(
|
||||
|
@ -1307,7 +1307,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
);
|
||||
None
|
||||
},
|
||||
#[cfg(not(feature = "gleam"))]
|
||||
#[cfg(not(feature = "gl"))]
|
||||
_ => None,
|
||||
};
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ use style_traits::CSSPixel;
|
|||
|
||||
mod compositor;
|
||||
pub mod compositor_thread;
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
mod gl;
|
||||
mod touch;
|
||||
pub mod windowing;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
use embedder_traits::EventLoopWaker;
|
||||
use euclid::TypedScale;
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
use gleam::gl;
|
||||
use keyboard_types::KeyboardEvent;
|
||||
use msg::constellation_msg::{TopLevelBrowsingContextId, TraversalDirection};
|
||||
|
@ -14,7 +14,7 @@ use script_traits::{MouseButton, TouchEventType, TouchId};
|
|||
use servo_geometry::DeviceIndependentPixel;
|
||||
use servo_url::ServoUrl;
|
||||
use std::fmt::{Debug, Error, Formatter};
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
use std::rc::Rc;
|
||||
use style_traits::DevicePixel;
|
||||
use webrender_api::{DeviceIntPoint, DevicePoint, DeviceUintRect, DeviceUintSize, ScrollLocation};
|
||||
|
@ -131,7 +131,7 @@ pub trait WindowMethods {
|
|||
/// proceed and false if it should not.
|
||||
fn prepare_for_composite(&self) -> bool;
|
||||
/// Return the GL function pointer trait.
|
||||
#[cfg(feature = "gleam")]
|
||||
#[cfg(feature = "gl")]
|
||||
fn gl(&self) -> Rc<dyn gl::Gl>;
|
||||
/// Returns a thread-safe object to wake up the window's event loop.
|
||||
fn create_event_loop_waker(&self) -> Box<dyn EventLoopWaker>;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue