aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/canvas/canvas_paint_task.rs10
-rw-r--r--components/compositing/compositor.rs6
-rw-r--r--components/gfx/paint_task.rs129
-rw-r--r--components/servo/Cargo.lock2
-rw-r--r--ports/cef/Cargo.lock2
-rw-r--r--ports/gonk/Cargo.lock2
6 files changed, 57 insertions, 94 deletions
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs
index f6f4d024f9a..450266c3883 100644
--- a/components/canvas/canvas_paint_task.rs
+++ b/components/canvas/canvas_paint_task.rs
@@ -521,12 +521,10 @@ impl<'a> CanvasPaintTask<'a> {
})
}
- fn send_native_surface(&self, chan: Sender<NativeSurface>) {
- let mut native_surface: NativeSurface =
- NativeSurface::from_draw_target_backing(self.drawtarget.backing.clone());
- native_surface.mark_wont_leak();
-
- chan.send(native_surface).unwrap();
+ fn send_native_surface(&self, _chan: Sender<NativeSurface>) {
+ // FIXME(mrobinson): We need a handle on the NativeDisplay to create compatible
+ // NativeSurfaces for the compositor.
+ unimplemented!()
}
fn get_image_data(&self, mut dest_rect: Rect<f64>, canvas_size: Size2D<f64>, chan: Sender<Vec<u8>>) {
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index b02027e4672..ec13f14a982 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -1155,10 +1155,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
fn fill_paint_request_with_cached_layer_buffers(&mut self, paint_request: &mut PaintRequest) {
- if opts::get().gpu_painting {
- return;
- }
-
for buffer_request in paint_request.buffer_requests.iter_mut() {
if self.buffer_map.mem() == 0 {
return;
@@ -1169,7 +1165,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
buffer.screen_pos = buffer_request.screen_rect;
buffer.resolution = paint_request.scale;
buffer.native_surface.mark_wont_leak();
- buffer.painted_with_cpu = true;
+ buffer.painted_with_cpu = !opts::get().gpu_painting;
buffer.content_age = buffer_request.content_age;
buffer_request.layer_buffer = Some(buffer);
}
diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs
index 698d9501140..928028a5dc6 100644
--- a/components/gfx/paint_task.rs
+++ b/components/gfx/paint_task.rs
@@ -27,7 +27,6 @@ use msg::constellation_msg::PipelineExitType;
use profile_traits::mem::{self, Reporter, ReportsChan};
use profile_traits::time::{self, profile};
use rand::{self, Rng};
-use skia::SkiaGrGLNativeContextRef;
use std::borrow::ToOwned;
use std::mem as std_mem;
use std::sync::{Arc, Mutex};
@@ -498,43 +497,48 @@ impl WorkerThread {
match self.receiver.recv().unwrap() {
MsgToWorkerThread::Exit => break,
MsgToWorkerThread::PaintTile(thread_id, tile, stacking_context, scale, layer_kind) => {
- let draw_target = self.optimize_and_paint_tile(thread_id,
- &tile,
- stacking_context,
- scale,
- layer_kind);
- let buffer = self.create_layer_buffer_for_painted_tile(tile,
- draw_target,
- scale);
+ let buffer = self.optimize_and_paint_tile(thread_id,
+ tile,
+ stacking_context,
+ scale,
+ layer_kind);
self.sender.send(MsgFromWorkerThread::PaintedTile(buffer)).unwrap()
}
}
}
}
+ fn create_draw_target_for_layer_buffer(&self,
+ size: Size2D<i32>,
+ layer_buffer: &mut Box<LayerBuffer>)
+ -> DrawTarget {
+ if !opts::get().gpu_painting {
+ DrawTarget::new(BackendType::Skia, size, SurfaceFormat::B8G8R8A8)
+ } else {
+ let gl_rasterization_context =
+ layer_buffer.native_surface.gl_rasterization_context(native_display!(self), size);
+ match gl_rasterization_context {
+ Some(gl_rasterization_context) => {
+ gl_rasterization_context.make_current();
+ DrawTarget::new_with_gl_rasterization_context(gl_rasterization_context,
+ SurfaceFormat::B8G8R8A8)
+ }
+ None => panic!("Could not create GPU rasterization context for LayerBuffer"),
+ }
+ }
+ }
+
fn optimize_and_paint_tile(&mut self,
thread_id: usize,
- tile: &BufferRequest,
+ mut tile: BufferRequest,
stacking_context: Arc<StackingContext>,
scale: f32,
layer_kind: LayerKind)
- -> DrawTarget {
- let size = Size2D::new(tile.screen_rect.size.width as i32, tile.screen_rect.size.height as i32);
- let draw_target = if !opts::get().gpu_painting {
- DrawTarget::new(BackendType::Skia, size, SurfaceFormat::B8G8R8A8)
- } else {
- // FIXME(pcwalton): Cache the components of draw targets (texture color buffer,
- // paintbuffers) instead of recreating them.
- let native_graphics_context =
- native_display!(self) as *const _ as SkiaGrGLNativeContextRef;
- let draw_target = DrawTarget::new_with_fbo(BackendType::Skia,
- native_graphics_context,
- size,
- SurfaceFormat::B8G8R8A8);
-
- draw_target.make_current();
- draw_target
- };
+ -> Box<LayerBuffer> {
+ let size = Size2D::new(tile.screen_rect.size.width as i32,
+ tile.screen_rect.size.height as i32);
+ let mut buffer = self.create_layer_buffer(&mut tile, scale);
+ let draw_target = self.create_draw_target_for_layer_buffer(size, &mut buffer);
{
// Build the paint context.
@@ -595,41 +599,25 @@ impl WorkerThread {
}
}
- draw_target
- }
-
- fn create_layer_buffer_for_gpu_painted_tile(&mut self,
- tile: BufferRequest,
- draw_target: DrawTarget,
- scale: f32)
- -> Box<LayerBuffer> {
- // GPU painting path:
- draw_target.make_current();
-
- // We mark the native surface as not leaking in case the surfaces
- // die on their way to the compositor task.
- // FIXME(pcwalton): We should supply the texture and native surface *to* the draw target in
- // GPU painting mode, so that it doesn't have to recreate it.
- let mut native_surface: NativeSurface =
- NativeSurface::from_draw_target_backing(draw_target.steal_draw_target_backing());
- native_surface.mark_wont_leak();
-
- box LayerBuffer {
- native_surface: native_surface,
- rect: tile.page_rect,
- screen_pos: tile.screen_rect,
- resolution: scale,
- painted_with_cpu: false,
- content_age: tile.content_age,
+ // Extract the texture from the draw target and place it into its slot in the buffer. If
+ // using CPU painting, upload it first.
+ if !opts::get().gpu_painting {
+ draw_target.snapshot().get_data_surface().with_data(|data| {
+ buffer.native_surface.upload(native_display!(self), data);
+ debug!("painting worker thread uploading to native surface {}",
+ buffer.native_surface.get_id());
+ });
}
+
+ draw_target.finish();
+ buffer
}
- fn create_layer_buffer_for_cpu_painted_tile(&mut self,
- mut tile: BufferRequest,
- draw_target: DrawTarget,
- scale: f32)
- -> Box<LayerBuffer> {
- let mut layer_buffer = tile.layer_buffer.take().unwrap_or_else(|| {
+ fn create_layer_buffer(&mut self,
+ tile: &mut BufferRequest,
+ scale: f32)
+ -> Box<LayerBuffer> {
+ tile.layer_buffer.take().unwrap_or_else(|| {
// Create an empty native surface. We mark it as not leaking
// in case it dies in transit to the compositor task.
let width = tile.screen_rect.size.width;
@@ -644,29 +632,10 @@ impl WorkerThread {
rect: tile.page_rect,
screen_pos: tile.screen_rect,
resolution: scale,
- painted_with_cpu: true,
+ painted_with_cpu: !opts::get().gpu_painting,
content_age: tile.content_age,
}
- });
-
- draw_target.snapshot().get_data_surface().with_data(|data| {
- layer_buffer.native_surface.upload(native_display!(self), data);
- debug!("painting worker thread uploading to native surface {}",
- layer_buffer.native_surface.get_id());
- });
- layer_buffer
- }
-
- fn create_layer_buffer_for_painted_tile(&mut self,
- tile: BufferRequest,
- draw_target: DrawTarget,
- scale: f32)
- -> Box<LayerBuffer> {
- if opts::get().gpu_painting {
- self.create_layer_buffer_for_gpu_painted_tile(tile, draw_target, scale)
- } else {
- self.create_layer_buffer_for_cpu_painted_tile(tile, draw_target, scale)
- }
+ })
}
}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index b4cbe59182a..afd187d7da5 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -676,7 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
+source = "git+https://github.com/servo/rust-layers#abc4f3803dde8d818343984a28d2e3d1fdad11a3"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 2c6062620be..3f69d1e34c8 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -668,7 +668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
+source = "git+https://github.com/servo/rust-layers#abc4f3803dde8d818343984a28d2e3d1fdad11a3"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index 8c7b256a8cf..6f4357d4003 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -602,7 +602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "layers"
version = "0.1.0"
-source = "git+https://github.com/servo/rust-layers#b1bb589f414a11ef577ea18cfc2814bdb40ea4dc"
+source = "git+https://github.com/servo/rust-layers#abc4f3803dde8d818343984a28d2e3d1fdad11a3"
dependencies = [
"azure 0.1.0 (git+https://github.com/servo/rust-azure)",
"cgl 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 19:35:42 +0000